From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34516) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cQc2m-0005lW-7w for qemu-devel@nongnu.org; Mon, 09 Jan 2017 10:39:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cQc2k-0000mJ-UK for qemu-devel@nongnu.org; Mon, 09 Jan 2017 10:39:32 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57630) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cQc2k-0000lq-P5 for qemu-devel@nongnu.org; Mon, 09 Jan 2017 10:39:30 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E694C83F43 for ; Mon, 9 Jan 2017 15:39:30 +0000 (UTC) From: "Daniel P. Berrange" Date: Mon, 9 Jan 2017 15:39:11 +0000 Message-Id: <20170109153914.27424-6-berrange@redhat.com> In-Reply-To: <20170109153914.27424-1-berrange@redhat.com> References: <20170109153914.27424-1-berrange@redhat.com> Subject: [Qemu-devel] [PATCH v2 5/8] io: add ability to associate an error with a task List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Currently when a task fails, the error is never explicitly associated with the task object, it is just passed along through the completion callback. This adds the ability to explicitly associate an error with the task. Signed-off-by: Daniel P. Berrange --- include/io/task.h | 32 ++++++++++++++++++++++++++++++++ io/task.c | 23 +++++++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/include/io/task.h b/include/io/task.h index ece1372..47daba9 100644 --- a/include/io/task.h +++ b/include/io/task.h @@ -240,6 +240,38 @@ void qio_task_abort(QIOTask *task, /** + * qio_task_set_error: + * @task: the task struct + * @err: pointer to the error, or NULL + * + * Associate an error with the task, which can later + * be retrieved with the qio_task_propagate_error() + * method. This method takes ownership of @err, so + * it is not valid to access it after this call + * completes. If @err is NULL this is a no-op. If + * this is call multiple times, only the first + * provided @err will be recorded, later ones will + * be discarded and freed. + */ +void qio_task_set_error(QIOTask *task, + Error *err); + + +/** + * qio_task_propagate_error: + * @task: the task struct + * @errp: pointer to a NULL-initialized error object + * + * Propagate the error associated with @task + * into @errp. + * + * Returns: true if an error was propagated, false otherwise + */ +bool qio_task_propagate_error(QIOTask *task, + Error **errp); + + +/** * qio_task_set_result_pointer: * @task: the task struct * @result: pointer to the result data diff --git a/io/task.c b/io/task.c index 675e196..1394e05 100644 --- a/io/task.c +++ b/io/task.c @@ -29,6 +29,7 @@ struct QIOTask { QIOTaskFunc func; gpointer opaque; GDestroyNotify destroy; + Error *err; gpointer result; GDestroyNotify destroyResult; }; @@ -62,6 +63,9 @@ static void qio_task_free(QIOTask *task) if (task->destroyResult) { task->destroyResult(task->result); } + if (task->err) { + error_free(task->err); + } object_unref(task->source); g_free(task); @@ -159,6 +163,25 @@ void qio_task_abort(QIOTask *task, } +void qio_task_set_error(QIOTask *task, + Error *err) +{ + error_propagate(&task->err, err); +} + + +bool qio_task_propagate_error(QIOTask *task, + Error **errp) +{ + if (task->err) { + error_propagate(errp, task->err); + return true; + } + + return false; +} + + void qio_task_set_result_pointer(QIOTask *task, gpointer result, GDestroyNotify destroy) -- 2.9.3