[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v13 for-4.1 06/11] qemu_thread: supplement error han
From: |
Fei Li |
Subject: |
[Qemu-devel] [PATCH v13 for-4.1 06/11] qemu_thread: supplement error handling for emulated_realize |
Date: |
Mon, 25 Mar 2019 21:54:06 +0800 |
From: Fei Li <address@hidden>
Utilize the existed errp to propagate the error and do the
corresponding cleanup to replace the temporary &error_abort.
Cc: Markus Armbruster <address@hidden>
Cc: Gerd Hoffmann <address@hidden>
Cc: Christophe Fergeau <address@hidden>
Cc: Marc-André Lureau <address@hidden>
Signed-off-by: Fei Li <address@hidden>
---
hw/usb/ccid-card-emulated.c | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c
index 0b170f6328..5ffc97dcfe 100644
--- a/hw/usb/ccid-card-emulated.c
+++ b/hw/usb/ccid-card-emulated.c
@@ -544,11 +544,18 @@ static void emulated_realize(CCIDCardState *base, Error
**errp)
error_setg(errp, "%s: failed to initialize vcard", TYPE_EMULATED_CCID);
goto out2;
}
- /* TODO: let the further caller handle the error instead of abort() here */
- qemu_thread_create(&card->event_thread_id, "ccid/event", event_thread,
- card, QEMU_THREAD_JOINABLE, &error_abort);
- qemu_thread_create(&card->apdu_thread_id, "ccid/apdu", handle_apdu_thread,
- card, QEMU_THREAD_JOINABLE, &error_abort);
+ if (qemu_thread_create(&card->event_thread_id, "ccid/event", event_thread,
+ card, QEMU_THREAD_JOINABLE, errp) < 0) {
+ goto out2;
+ }
+ if (qemu_thread_create(&card->apdu_thread_id, "ccid/apdu",
+ handle_apdu_thread, card,
+ QEMU_THREAD_JOINABLE, errp) < 0) {
+ VEvent *vevent = vevent_new(VEVENT_LAST, NULL, NULL);
+ vevent_queue_vevent(vevent); /* stop vevent thread */
+ qemu_thread_join(&card->event_thread_id);
+ goto out2;
+ }
return;
--
2.11.0
- [Qemu-devel] [PATCH v13 for-4.1 00/11] qemu_thread_create: propagate the error to callers to handle, Fei Li, 2019/03/25
- [Qemu-devel] [PATCH v13 for-4.1 01/11] qemu_thread: make qemu_thread_create() take Error ** argument, Fei Li, 2019/03/25
- [Qemu-devel] [PATCH v13 for-4.1 03/11] qemu_thread: supplement error handling for qmp_dump_guest_memory, Fei Li, 2019/03/25
- [Qemu-devel] [PATCH v13 for-4.1 02/11] qemu_thread: supplement error handling for qemu_X_start_vcpu, Fei Li, 2019/03/25
- [Qemu-devel] [PATCH v13 for-4.1 04/11] qemu_thread: supplement error handling for pci_edu_realize, Fei Li, 2019/03/25
- [Qemu-devel] [PATCH v13 for-4.1 05/11] qemu_thread: supplement error handling for h_resize_hpt_prepare, Fei Li, 2019/03/25
- [Qemu-devel] [PATCH v13 for-4.1 06/11] qemu_thread: supplement error handling for emulated_realize,
Fei Li <=
- [Qemu-devel] [PATCH v13 for-4.1 07/11] qemu_thread: supplement error handling for iothread_complete, Fei Li, 2019/03/25
- [Qemu-devel] [PATCH v13 for-4.1 08/11] qemu_thread: supplement error handling for qemu_signalfd_compat, Fei Li, 2019/03/25
- [Qemu-devel] [PATCH v13 for-4.1 10/11] qemu_thread: supplement error handling for vnc_start_worker_thread, Fei Li, 2019/03/25
- [Qemu-devel] [PATCH v13 for-4.1 09/11] qemu_thread: supplement error handling for migration, Fei Li, 2019/03/25
- [Qemu-devel] [PATCH v13 for-4.1 11/11] qemu_thread: supplement error handling for touch_all_pages, Fei Li, 2019/03/25
- Re: [Qemu-devel] [PATCH v13 for-4.1 00/11] qemu_thread_create: propagate the error to callers to handle, no-reply, 2019/03/25