[Qemu-devel] [PATCH v12 for-4.1 06/11] qemu_thread: supplement error handling for emulated_realize

2019-03-24 Thread Fei Li 
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: Gerd Hoffmann 
Cc: Christophe Fergeau 
Cc: Marc-André Lureau 
Signed-off-by: Fei Li 
---
 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 v12 for-4.1 06/11] qemu_thread: supplement error handling for emulated_realize

2019-03-24 Thread Fei Li 
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: Gerd Hoffmann 
Signed-off-by: Fei Li 
---
 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