From 59de517d8d482416a079da7ee8344187d513d4a4 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Thu, 11 Aug 2016 17:38:07 +0100 Subject: io: remove Error parameter from QIOTask thread worker Now that task objects have a directly associated error, there's no need for an an Error **errp parameter to the QIOTask thread worker function. It already has a QIOTask object, so can directly set the error on it. Reviewed-by: Eric Blake Signed-off-by: Daniel P. Berrange --- io/task.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'io/task.c') diff --git a/io/task.c b/io/task.c index 42e1a75586..60bf1a94d5 100644 --- a/io/task.c +++ b/io/task.c @@ -77,8 +77,6 @@ struct QIOTaskThreadData { QIOTaskWorker worker; gpointer opaque; GDestroyNotify destroy; - Error *err; - int ret; }; @@ -87,9 +85,6 @@ static gboolean gio_task_thread_result(gpointer opaque) struct QIOTaskThreadData *data = opaque; trace_qio_task_thread_result(data->task); - if (data->err) { - qio_task_set_error(data->task, data->err); - } qio_task_complete(data->task); if (data->destroy) { @@ -107,10 +102,7 @@ static gpointer qio_task_thread_worker(gpointer opaque) struct QIOTaskThreadData *data = opaque; trace_qio_task_thread_run(data->task); - data->ret = data->worker(data->task, &data->err, data->opaque); - if (data->ret < 0 && data->err == NULL) { - error_setg(&data->err, "Task worker failed but did not set an error"); - } + data->worker(data->task, data->opaque); /* We're running in the background thread, and must only * ever report the task results in the main event loop -- cgit v1.2.3