From nobody Tue Feb 10 04:02:24 2026 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=126.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548998799369825.5353181212498; Thu, 31 Jan 2019 21:26:39 -0800 (PST) Received: from localhost ([127.0.0.1]:39003 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpRLW-0001Yp-TW for importer@patchew.org; Fri, 01 Feb 2019 00:26:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40444) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpRDs-0003hc-O1 for qemu-devel@nongnu.org; Fri, 01 Feb 2019 00:18:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gpRDr-0007qY-Rt for qemu-devel@nongnu.org; Fri, 01 Feb 2019 00:18:40 -0500 Received: from m50-111.126.com ([123.125.50.111]:54036) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpRDr-0007m4-7s for qemu-devel@nongnu.org; Fri, 01 Feb 2019 00:18:39 -0500 Received: from bogon.bytedance.net (unknown [120.52.147.46]) by smtp5 (Coremail) with SMTP id jtKowABXEaSW1lNcujAMAA--.154S8; Fri, 01 Feb 2019 13:18:21 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=tPLGv2NaGPYPL035Tp D0GXNURkRJL2UOc7qJspCMBMw=; b=mKACvRUGPZsvzhrVpMPXHexNKznRSCnq6i 0YbcUrX0+4sdlMGH2LYj58MhfeKsCfktuBIgGVaKYbbnBCvMJ9uKq7vaNrvT39a9 +i1acvt+8TnRlzv37M7ikTyyoOswCPhoVqnZMPsrXEUR2iHSfBd3gSlY+E3RZmq6 OkevCQpo0= From: Fei Li To: qemu-devel@nongnu.org, shirley17fei@gmail.com Date: Fri, 1 Feb 2019 13:18:01 +0800 Message-Id: <20190201051806.53183-7-lifei1214@126.com> X-Mailer: git-send-email 2.17.2 (Apple Git-113) In-Reply-To: <20190201051806.53183-1-lifei1214@126.com> References: <20190201051806.53183-1-lifei1214@126.com> X-CM-TRANSID: jtKowABXEaSW1lNcujAMAA--.154S8 X-Coremail-Antispam: 1Uf129KBjvJXoW7AFyDWr4xGrW8GF4DuF4Uurg_yoW8XrWkpr yUury3Jrs3Zr1avaya93Z2vFW5Gws2ga4UG397Jw1UAws8Wr13ZrWSka4rurW7AFyYqry5 ZFW5KF95WFW2qFJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jp2NtUUUUU= X-Originating-IP: [120.52.147.46] X-CM-SenderInfo: 5olivxarsrkqqrswhudrp/1tbikh1OIVpD7qFGywAAs7 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 123.125.50.111 Subject: [Qemu-devel] [PATCH v11 for-4.0 06/11] qemu_thread: supplement error handling for emulated_realize X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fei Li , Markus Armbruster , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 | 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, Err= or **errp) error_setg(errp, "%s: failed to initialize vcard", TYPE_EMULATED_C= CID); goto out2; } - /* TODO: let the further caller handle the error instead of abort() he= re */ - 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_thr= ead, - card, QEMU_THREAD_JOINABLE, &error_abort); + if (qemu_thread_create(&card->event_thread_id, "ccid/event", event_thr= ead, + 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); + goto out2; + } =20 return; =20 --=20 2.17.2 (Apple Git-113)