From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:33246) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gbnL3-0001Vr-MI for qemu-devel@nongnu.org; Tue, 25 Dec 2018 09:05:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gbnL2-0003u7-TV for qemu-devel@nongnu.org; Tue, 25 Dec 2018 09:05:41 -0500 Received: from smtp.nue.novell.com ([195.135.221.5]:54768) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gbnL2-0003ti-KE for qemu-devel@nongnu.org; Tue, 25 Dec 2018 09:05:40 -0500 From: Fei Li Date: Tue, 25 Dec 2018 22:04:44 +0800 Message-Id: <20181225140449.15786-12-fli@suse.com> In-Reply-To: <20181225140449.15786-1-fli@suse.com> References: <20181225140449.15786-1-fli@suse.com> Subject: [Qemu-devel] [PATCH for-4.0 v9 11/16] qemu_thread: supplement error handling for emulated_realize List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, shirley17fei@gmail.com Cc: lifei1214@126.com, "Cc : Markus Armbruster" , Gerd Hoffmann Utilize the existed errp to propagate the error and do the corresponding cleanup to replace the temporary &error_abort. Cc: Cc: Markus Armbruster Cc: Gerd Hoffmann Signed-off-by: Fei Li --- hw/usb/ccid-card-emulated.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c index f8ff7ff4a3..9245b4fcad 100644 --- a/hw/usb/ccid-card-emulated.c +++ b/hw/usb/ccid-card-emulated.c @@ -32,7 +32,6 @@ #include "qemu/thread.h" #include "qemu/main-loop.h" #include "ccid.h" -#include "qapi/error.h" #define DPRINTF(card, lvl, fmt, ...) \ do {\ @@ -544,11 +543,15 @@ 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)) { + goto out2; + } + if (!qemu_thread_create(&card->apdu_thread_id, "ccid/apdu", + handle_apdu_thread, card, + QEMU_THREAD_JOINABLE, errp)) { + goto out2; + } out2: clean_event_notifier(card); -- 2.13.7