[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v11 for-4.0 06/11] qemu_thread: supplement error
From: |
Markus Armbruster |
Subject: |
Re: [Qemu-devel] [PATCH v11 for-4.0 06/11] qemu_thread: supplement error handling for emulated_realize |
Date: |
Fri, 01 Feb 2019 14:04:59 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) |
Fei Li <address@hidden> writes:
> 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>
> Signed-off-by: Fei Li <address@hidden>
> ---
> hw/usb/ccid-card-emulated.c | 15 ++++++++++-----
> 1 file changed, 10 insertions(+), 5 deletions(-)
>
> diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c
> index 0b170f6328..19b4b9a8fa 100644
> --- a/hw/usb/ccid-card-emulated.c
> +++ b/hw/usb/ccid-card-emulated.c
> @@ -544,11 +544,16 @@ 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) {
> + qemu_thread_join(&card->event_thread_id);
What makes event_thread terminate here?
I'm asking because if it doesn't, the join will hang.
> + goto out2;
> + }
>
> return;
[Qemu-devel] [PATCH v11 for-4.0 03/11] qemu_thread: supplement error handling for qmp_dump_guest_memory, Fei Li, 2019/02/01
[Qemu-devel] [PATCH v11 for-4.0 06/11] qemu_thread: supplement error handling for emulated_realize, Fei Li, 2019/02/01
[Qemu-devel] [PATCH v11 for-4.0 05/11] qemu_thread: supplement error handling for h_resize_hpt_prepare, Fei Li, 2019/02/01
[Qemu-devel] [PATCH v11 for-4.0 08/11] qemu_thread: supplement error handling for qemu_signalfd_compat, Fei Li, 2019/02/01
[Qemu-devel] [PATCH v11 for-4.0 09/11] qemu_thread: supplement error handling for migration, Fei Li, 2019/02/01