[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v12 for-4.1 10/11] qemu_thread: supplement error han
From: |
Fei Li |
Subject: |
[Qemu-devel] [PATCH v12 for-4.1 10/11] qemu_thread: supplement error handling for vnc_start_worker_thread |
Date: |
Mon, 25 Mar 2019 01:29:55 +0800 |
From: Fei Li <address@hidden>
Supplement the error handling for vnc_thread_worker_thread: add
an Error parameter for it to propagate the error to its caller to
handle in case it fails, and make it return a Boolean to indicate
whether it succeeds.
Cc: Markus Armbruster <address@hidden>
Cc: Gerd Hoffmann <address@hidden>
Signed-off-by: Fei Li <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
---
ui/vnc-jobs.c | 17 +++++++++++------
ui/vnc-jobs.h | 2 +-
ui/vnc.c | 4 +++-
3 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/ui/vnc-jobs.c b/ui/vnc-jobs.c
index 5712f1f501..1371895513 100644
--- a/ui/vnc-jobs.c
+++ b/ui/vnc-jobs.c
@@ -332,16 +332,21 @@ static bool vnc_worker_thread_running(void)
return queue; /* Check global queue */
}
-void vnc_start_worker_thread(void)
+bool vnc_start_worker_thread(Error **errp)
{
VncJobQueue *q;
- if (vnc_worker_thread_running())
- return ;
+ if (vnc_worker_thread_running()) {
+ return true;
+ }
q = vnc_queue_init();
- /* TODO: let the further caller handle the error instead of abort() here */
- qemu_thread_create(&q->thread, "vnc_worker", vnc_worker_thread,
- q, QEMU_THREAD_DETACHED, &error_abort);
+ if (qemu_thread_create(&q->thread, "vnc_worker", vnc_worker_thread,
+ q, QEMU_THREAD_DETACHED, errp) < 0) {
+ vnc_queue_clear(q);
+ return false;
+ }
queue = q; /* Set global queue */
+
+ return true;
}
diff --git a/ui/vnc-jobs.h b/ui/vnc-jobs.h
index 59f66bcc35..14640593db 100644
--- a/ui/vnc-jobs.h
+++ b/ui/vnc-jobs.h
@@ -37,7 +37,7 @@ void vnc_job_push(VncJob *job);
void vnc_jobs_join(VncState *vs);
void vnc_jobs_consume_buffer(VncState *vs);
-void vnc_start_worker_thread(void);
+bool vnc_start_worker_thread(Error **errp);
/* Locks */
static inline int vnc_trylock_display(VncDisplay *vd)
diff --git a/ui/vnc.c b/ui/vnc.c
index 1871422e1d..602e6b679d 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -3202,7 +3202,9 @@ void vnc_display_init(const char *id, Error **errp)
vd->connections_limit = 32;
qemu_mutex_init(&vd->mutex);
- vnc_start_worker_thread();
+ if (!vnc_start_worker_thread(errp)) {
+ return;
+ }
vd->dcl.ops = &dcl_ops;
register_displaychangelistener(&vd->dcl);
--
2.11.0
- [Qemu-devel] [PATCH v12 for-4.1 10/11] qemu_thread: supplement error handling for vnc_start_worker_thread,
Fei Li <=