[Qemu-devel] [PATCH v12 for-4.1 07/11] qemu_thread: supplement error handling for iothread_complete
From: Fei Li
Utilize the existed errp to propagate the error and do the
corresponding cleanup to replace the temporary &error_abort.
Cc: Markus Armbruster
Cc: Stefan Hajnoczi
Cc: Eric Blake
Signed-off-by: Fei Li
Reviewed-by: Markus Armbruster
---
iothread.c | 18 --
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/iothread.c b/iothread.c
index 2d5a5bfe6c..1ebacaf089 100644
--- a/iothread.c
+++ b/iothread.c
@@ -166,6 +166,7 @@ static void iothread_complete(UserCreatable *obj, Error
**errp)
Error *local_error = NULL;
IOThread *iothread = IOTHREAD(obj);
char *name, *thread_name;
+int thread_ok;
iothread->stopping = false;
iothread->running = true;
@@ -188,9 +189,7 @@ static void iothread_complete(UserCreatable *obj, Error
**errp)
&local_error);
if (local_error) {
error_propagate(errp, local_error);
-aio_context_unref(iothread->ctx);
-iothread->ctx = NULL;
-return;
+goto fail;
}
/* This assumes we are called from a thread with useful CPU affinity for us
@@ -198,16 +197,23 @@ static void iothread_complete(UserCreatable *obj, Error
**errp)
*/
name = object_get_canonical_path_component(OBJECT(obj));
thread_name = g_strdup_printf("IO %s", name);
-/* TODO: let the further caller handle the error instead of abort() here */
-qemu_thread_create(&iothread->thread, thread_name, iothread_run,
- iothread, QEMU_THREAD_JOINABLE, &error_abort);
+thread_ok = qemu_thread_create(&iothread->thread, thread_name,
iothread_run,
+ iothread, QEMU_THREAD_JOINABLE, errp);
g_free(thread_name);
g_free(name);
+if (thread_ok < 0) {
+qemu_sem_destroy(&iothread->init_done_sem);
+goto fail;
+}
/* Wait for initialization to complete */
while (iothread->thread_id == -1) {
qemu_sem_wait(&iothread->init_done_sem);
}
+return;
+fail:
+aio_context_unref(iothread->ctx);
+iothread->ctx = NULL;
}
typedef struct {
--
2.11.0
[Qemu-devel] [PATCH v12 for-4.1 07/11] qemu_thread: supplement error handling for iothread_complete
From: Fei Li
Utilize the existed errp to propagate the error and do the
corresponding cleanup to replace the temporary &error_abort.
Cc: Markus Armbruster
Cc: Stefan Hajnoczi
Cc: Eric Blake
Signed-off-by: Fei Li
Reviewed-by: Markus Armbruster
---
iothread.c | 18 --
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/iothread.c b/iothread.c
index 2d5a5bfe6c..1ebacaf089 100644
--- a/iothread.c
+++ b/iothread.c
@@ -166,6 +166,7 @@ static void iothread_complete(UserCreatable *obj, Error
**errp)
Error *local_error = NULL;
IOThread *iothread = IOTHREAD(obj);
char *name, *thread_name;
+int thread_ok;
iothread->stopping = false;
iothread->running = true;
@@ -188,9 +189,7 @@ static void iothread_complete(UserCreatable *obj, Error
**errp)
&local_error);
if (local_error) {
error_propagate(errp, local_error);
-aio_context_unref(iothread->ctx);
-iothread->ctx = NULL;
-return;
+goto fail;
}
/* This assumes we are called from a thread with useful CPU affinity for us
@@ -198,16 +197,23 @@ static void iothread_complete(UserCreatable *obj, Error
**errp)
*/
name = object_get_canonical_path_component(OBJECT(obj));
thread_name = g_strdup_printf("IO %s", name);
-/* TODO: let the further caller handle the error instead of abort() here */
-qemu_thread_create(&iothread->thread, thread_name, iothread_run,
- iothread, QEMU_THREAD_JOINABLE, &error_abort);
+thread_ok = qemu_thread_create(&iothread->thread, thread_name,
iothread_run,
+ iothread, QEMU_THREAD_JOINABLE, errp);
g_free(thread_name);
g_free(name);
+if (thread_ok < 0) {
+qemu_sem_destroy(&iothread->init_done_sem);
+goto fail;
+}
/* Wait for initialization to complete */
while (iothread->thread_id == -1) {
qemu_sem_wait(&iothread->init_done_sem);
}
+return;
+fail:
+aio_context_unref(iothread->ctx);
+iothread->ctx = NULL;
}
typedef struct {
--
2.11.0
