Fei Li <lifei1...@126.com> writes:
> From: Fei Li <f...@suse.com>
>
> Utilize the existed errp to propagate the error and do the
> corresponding cleanup to replace the temporary &error_abort.
>
> Cc: Markus Armbruster <arm...@redhat.com>
> Cc: Gerd Hoffmann <kra...@redhat.com>
> Signed-off-by: Fei Li <f...@suse.com>
> ---
> 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;
