From nobody Tue Feb 10 19:23:14 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 151690080758853.01171049481968; Thu, 25 Jan 2018 09:20:07 -0800 (PST) Received: from localhost ([::1]:52523 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eelC1-0000AM-Sf for importer@patchew.org; Thu, 25 Jan 2018 12:20:05 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60741) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eel6s-0004d2-TO for qemu-devel@nongnu.org; Thu, 25 Jan 2018 12:14:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eel6r-000514-Td for qemu-devel@nongnu.org; Thu, 25 Jan 2018 12:14:46 -0500 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:41916) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eel6r-00050o-PP for qemu-devel@nongnu.org; Thu, 25 Jan 2018 12:14:45 -0500 Received: by mail-qt0-x242.google.com with SMTP id i1so21012584qtj.8 for ; Thu, 25 Jan 2018 09:14:45 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id u23sm2012835qke.88.2018.01.25.09.14.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Jan 2018 09:14:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TM1uRRnylFqSDkHHC1JaiSmC8Qvy3f8e+QQXJgoMSxU=; b=fgTDObL3neazStX9mkTlcrDgw19Z/BSSarKVUYo+khRrekXjyl5d6VclsxSrqym6LO TUcGPHbN0vhXwizXnji3yGhEMDrR2gWGqT2b3uzSMIOVYgFu+1rSNYWEf/15pyT3XsoV 3WzozoULUEFNJl3NV0w7kZGk+kI2n0OllS9FsZ+zRK2vN89XoPIizSD8nhNUUpoyHlJi XcNWxr8gpl89MISbobgC37xnBi6n+rlNT7n5sjbcjOHEAkX3uOezGRx9r4uu3mPdvggf WBxJEkpZLglmp/tcYl6RwHUcP1UBLbhI3C6ibylErOTXy2s89g89o0Qf0lY9aggUYOcS 1MnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=TM1uRRnylFqSDkHHC1JaiSmC8Qvy3f8e+QQXJgoMSxU=; b=h4hBgO9v9fxDOke6I3YVooPCoSI0MESd9hRADjn4zx1bbZZ3pFD96Ee3ok3ZX5JiiT kKKEcs9O+931rNlcj9pPaF06jvqlexFqZONNk3WDZWxxFQLrU4IlF1UFR/YTx8M9pt62 dyJt1aaw8+ooVTWrm/Ut/Nzo3chdo7GQmC31rEz8uD1XCOmJM35ePnIK4AFBJJdthXUM 9Nd9n2VO3OQ0JjhuywQXxk9/sN8ju/r/1p8XIDdIkgKxQ4EOYjyij5ZORdXBCU1yENme e30TYQ1gFRZZOB5nNvW0ixLyUS7iRSL1LFpJYhdm9nmfYMc2i1mNpklkYEfkp+RNsjY9 3z8A== X-Gm-Message-State: AKwxytecumr7YgF6vag9QqqN+pvMlgisTrj0+bnlReQJK0BlUjSaoVzt 9N/AM3PGTu7HDduo7+Wtt2U= X-Google-Smtp-Source: AH8x224JHB3v7y+QjDV9ZOV0d21TBENFjtf5O+s1c3q6LJBNJGo01dYPIZGhjOW0I8P7btbhPBVusw== X-Received: by 10.200.36.130 with SMTP id s2mr17413509qts.0.1516900485397; Thu, 25 Jan 2018 09:14:45 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Gerd Hoffmann , Mao Zhongyi , Cao jin Date: Thu, 25 Jan 2018 14:14:32 -0300 Message-Id: <20180125171432.13554-4-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180125171432.13554-1-f4bug@amsat.org> References: <20180125171432.13554-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::242 Subject: [Qemu-devel] [PATCH v3 3/3] usb-ccid: convert CCIDCardClass::exitfn() -> unrealize() 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/usb/ccid.h | 4 +++- hw/usb/ccid-card-emulated.c | 4 ++-- hw/usb/ccid-card-passthru.c | 1 + hw/usb/dev-smartcard-reader.c | 25 +++++++++++-------------- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/hw/usb/ccid.h b/hw/usb/ccid.h index 6c6c10188d..3920733f13 100644 --- a/hw/usb/ccid.h +++ b/hw/usb/ccid.h @@ -28,13 +28,15 @@ typedef struct CCIDCardInfo CCIDCardInfo; * into the smartcard device (hw/ccid-card-*.c) */ typedef struct CCIDCardClass { + /*< private >*/ DeviceClass parent_class; + /*< public >*/ const uint8_t *(*get_atr)(CCIDCardState *card, uint32_t *len); void (*apdu_from_guest)(CCIDCardState *card, const uint8_t *apdu, uint32_t len); - void (*exitfn)(CCIDCardState *card); void (*realize)(CCIDCardState *card, Error **errp); + void (*unrealize)(CCIDCardState *card, Error **errp); } CCIDCardClass; =20 /* diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c index daefd9f8f4..ea42e4681d 100644 --- a/hw/usb/ccid-card-emulated.c +++ b/hw/usb/ccid-card-emulated.c @@ -547,7 +547,7 @@ static void emulated_realize(CCIDCardState *base, Error= **errp) card, QEMU_THREAD_JOINABLE); } =20 -static void emulated_exitfn(CCIDCardState *base) +static void emulated_unrealize(CCIDCardState *base, Error **errp) { EmulatedState *card =3D EMULATED_CCID_CARD(base); VEvent *vevent =3D vevent_new(VEVENT_LAST, NULL, NULL); @@ -582,7 +582,7 @@ static void emulated_class_initfn(ObjectClass *klass, v= oid *data) CCIDCardClass *cc =3D CCID_CARD_CLASS(klass); =20 cc->realize =3D emulated_realize; - cc->exitfn =3D emulated_exitfn; + cc->unrealize =3D emulated_unrealize; cc->get_atr =3D emulated_get_atr; cc->apdu_from_guest =3D emulated_apdu_from_guest; set_bit(DEVICE_CATEGORY_INPUT, dc->categories); diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c index b7dd3602dc..085ed2c667 100644 --- a/hw/usb/ccid-card-passthru.c +++ b/hw/usb/ccid-card-passthru.c @@ -9,6 +9,7 @@ */ =20 #include "qemu/osdep.h" +#include "qapi/error.h" #include #include "chardev/char-fe.h" #include "qemu/error-report.h" diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c index 85f5f2247b..e6468057a0 100644 --- a/hw/usb/dev-smartcard-reader.c +++ b/hw/usb/dev-smartcard-reader.c @@ -500,16 +500,6 @@ static void ccid_card_apdu_from_guest(CCIDCardState *c= ard, } } =20 -static void ccid_card_exitfn(CCIDCardState *card) -{ - CCIDCardClass *cc =3D CCID_CARD_GET_CLASS(card); - - if (cc->exitfn) { - cc->exitfn(card); - } - -} - static bool ccid_has_pending_answers(USBCCIDState *s) { return s->pending_answers_num > 0; @@ -1271,18 +1261,25 @@ void ccid_card_card_inserted(CCIDCardState *card) ccid_on_slot_change(s, true); } =20 -static int ccid_card_exit(DeviceState *qdev) +static void ccid_card_unrealize(DeviceState *qdev, Error **errp) { CCIDCardState *card =3D CCID_CARD(qdev); + CCIDCardClass *cc =3D CCID_CARD_GET_CLASS(card); USBDevice *dev =3D USB_DEVICE(qdev->parent_bus->parent); USBCCIDState *s =3D USB_CCID_DEV(dev); + Error *local_err =3D NULL; =20 if (ccid_card_inserted(s)) { ccid_card_card_removed(card); } - ccid_card_exitfn(card); + if (cc->unrealize) { + cc->unrealize(card, &local_err); + if (local_err !=3D NULL) { + error_propagate(errp, local_err); + return; + } + } s->card =3D NULL; - return 0; } =20 static void ccid_card_realize(DeviceState *qdev, Error **errp) @@ -1472,7 +1469,7 @@ static void ccid_card_class_init(ObjectClass *klass, = void *data) DeviceClass *k =3D DEVICE_CLASS(klass); k->bus_type =3D TYPE_CCID_BUS; k->realize =3D ccid_card_realize; - k->exit =3D ccid_card_exit; + k->unrealize =3D ccid_card_unrealize; k->props =3D ccid_props; } =20 --=20 2.15.1