From 60e705c51c66373f78e536e0462744a610c27cf6 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Thu, 11 Aug 2016 15:20:58 +0100 Subject: io: change the QIOTask callback signature Currently the QIOTaskFunc signature takes an Object * for the source, and an Error * for any error. We also need to be able to provide a result pointer. Rather than continue to add parameters to QIOTaskFunc, remove the existing ones and simply pass the QIOTask object instead. This has methods to access all the other data items required in the callback impl. Reviewed-by: Eric Blake Signed-off-by: Daniel P. Berrange --- nbd/common.c | 8 +++----- nbd/nbd-internal.h | 3 +-- 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'nbd') diff --git a/nbd/common.c b/nbd/common.c index b583a4f..a5f39ea 100644 --- a/nbd/common.c +++ b/nbd/common.c @@ -78,15 +78,13 @@ ssize_t nbd_wr_syncv(QIOChannel *ioc, } -void nbd_tls_handshake(Object *src, - Error *err, +void nbd_tls_handshake(QIOTask *task, void *opaque) { struct NBDTLSHandshakeData *data = opaque; - if (err) { - TRACE("TLS failed %s", error_get_pretty(err)); - data->error = error_copy(err); + if (qio_task_propagate_error(task, &data->error)) { + TRACE("TLS failed %s", error_get_pretty(data->error)); } data->complete = true; g_main_loop_quit(data->loop); diff --git a/nbd/nbd-internal.h b/nbd/nbd-internal.h index eee20ab..f43d990 100644 --- a/nbd/nbd-internal.h +++ b/nbd/nbd-internal.h @@ -120,8 +120,7 @@ struct NBDTLSHandshakeData { }; -void nbd_tls_handshake(Object *src, - Error *err, +void nbd_tls_handshake(QIOTask *task, void *opaque); #endif -- cgit v1.1