From nobody Thu May 2 02:12:31 2024 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 1516901283992803.4354257432291; Thu, 25 Jan 2018 09:28:03 -0800 (PST) Received: from localhost ([::1]:53016 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eelJh-0006XC-Ug for importer@patchew.org; Thu, 25 Jan 2018 12:28:01 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60704) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eel6p-0004ai-VW for qemu-devel@nongnu.org; Thu, 25 Jan 2018 12:14:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eel6n-0004z2-HY for qemu-devel@nongnu.org; Thu, 25 Jan 2018 12:14:43 -0500 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:33559) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eel6n-0004yt-C4 for qemu-devel@nongnu.org; Thu, 25 Jan 2018 12:14:41 -0500 Received: by mail-qt0-x242.google.com with SMTP id d8so21039527qtm.0 for ; Thu, 25 Jan 2018 09:14:41 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id u23sm2012835qke.88.2018.01.25.09.14.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Jan 2018 09:14:40 -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=ST4WAjm2d8prLvU4NX4oz0L86KDtFuq0nMPnGTtBUkE=; b=Mc9N638Yu1BoUyc+OMqas3BXLf57q0nxWLiKz7SXiGv0pXye7n29qlMblLDt5iD27m 7YFez1UTPjRWulTlanwk6NZSRyxgtDCpirZACjOqarIAseKiSrP5WYCVaq+h5IugUvzm Hh6/GjzjovmhQw1ZdbzrOCRXkEaMq3ZycJUWeaR3ZsktTYt/ldLD5lNycE6zVgfvxHXx vR5z1SHrQcVD/9Wx6aH+c2mC2pb9L5LCp79l3MsRYWXJE8ixh8Y1iuNIxaPXCQbbe5qj wI4fYnV9WaTteg/xiqN8uKCZokiLN7oQwm6OHZ7bayADmJmJxO3mvwAPEDiIxTxi5jb3 O+2Q== 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=ST4WAjm2d8prLvU4NX4oz0L86KDtFuq0nMPnGTtBUkE=; b=nfVRZRnNuK2DzYzmy4RlZS8dSWlYnx122/rr0VSAZrYeDlBzh6Hjfs8WLUyFE6yTgI G1/g6kW+gEmbHlNh5g7UW8DEnfB6GgFTCi0yWQb/PVH+qDeCOuOCSEFC678Tmsy2prO4 qxSOMC2dy940/60wxOCiTsw6iJOx+6IGDmzql37pxwmCFVBeRKqxKrYa7R38Qh3TZsCp HYdbCySlL/t/kBA2hhGCt1+xjNXATPc5dhBjCPtkH4EAAId9Wqfjd6IqR6q271/rMZ6G pHidNJFvXcHfFCvK8asq2500YUP38LlAGYtRv24TFAj/tMvBbWSuknHWiA6gDt3sC9Uw Xbug== X-Gm-Message-State: AKwxytd/46tR15EzOoSnwkIr6VCO3Tr3BS9xDhn9Fil5CXQEwK7W2G+U Fu+IeZOErzVz+wM4zZGFcLyooFx3 X-Google-Smtp-Source: AH8x224dtbnBxO3Ip3R2jvNCXokVqy22Q/YelIJDtXYbSiQZ/agblSBVdGh3PjSfuO2uh1cf6tOe/Q== X-Received: by 10.237.55.40 with SMTP id i37mr17470850qtb.226.1516900480837; Thu, 25 Jan 2018 09:14:40 -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:30 -0300 Message-Id: <20180125171432.13554-2-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 1/3] hw/usb/ccid: Make ccid_card_init() take an error parameter 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: qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 From: Mao Zhongyi Replace init() of CCIDCardClass with realize, then convert ccid_card_init(), ccid_card_initfn() and it's callbacks to take an Error** in ordor to report the error more clearly. Signed-off-by: Mao Zhongyi Signed-off-by: Cao jin [PMD: fixed s->card assignation in ccid_card_realize()] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/usb/ccid.h | 2 +- hw/usb/ccid-card-emulated.c | 44 +++++++++++++++++++++------------------= ---- hw/usb/ccid-card-passthru.c | 12 ++++++------ hw/usb/dev-smartcard-reader.c | 37 ++++++++++++++++++++---------------- 4 files changed, 50 insertions(+), 45 deletions(-) diff --git a/hw/usb/ccid.h b/hw/usb/ccid.h index 1f070116d6..6c6c10188d 100644 --- a/hw/usb/ccid.h +++ b/hw/usb/ccid.h @@ -34,7 +34,7 @@ typedef struct CCIDCardClass { const uint8_t *apdu, uint32_t len); void (*exitfn)(CCIDCardState *card); - int (*initfn)(CCIDCardState *card); + void (*realize)(CCIDCardState *card, Error **errp); } CCIDCardClass; =20 /* diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c index e646eb243b..daefd9f8f4 100644 --- a/hw/usb/ccid-card-emulated.c +++ b/hw/usb/ccid-card-emulated.c @@ -35,6 +35,7 @@ #include "qemu/thread.h" #include "qemu/main-loop.h" #include "ccid.h" +#include "qapi/error.h" =20 #define DPRINTF(card, lvl, fmt, ...) \ do {\ @@ -401,10 +402,10 @@ static void card_event_handler(EventNotifier *notifie= r) qemu_mutex_unlock(&card->event_list_mutex); } =20 -static int init_event_notifier(EmulatedState *card) +static int init_event_notifier(EmulatedState *card, Error **errp) { if (event_notifier_init(&card->notifier, false) < 0) { - DPRINTF(card, 2, "event notifier creation failed\n"); + error_setg(errp, "ccid-card-emul: event notifier creation failed"); return -1; } event_notifier_set_handler(&card->notifier, card_event_handler); @@ -480,7 +481,7 @@ static uint32_t parse_enumeration(char *str, return ret; } =20 -static int emulated_initfn(CCIDCardState *base) +static void emulated_realize(CCIDCardState *base, Error **errp) { EmulatedState *card =3D EMULATED_CCID_CARD(base); VCardEmulError ret; @@ -494,8 +495,8 @@ static int emulated_initfn(CCIDCardState *base) qemu_cond_init(&card->handle_apdu_cond); card->reader =3D NULL; card->quit_apdu_thread =3D 0; - if (init_event_notifier(card) < 0) { - return -1; + if (init_event_notifier(card, errp) < 0) { + return; } =20 card->backend =3D 0; @@ -505,11 +506,11 @@ static int emulated_initfn(CCIDCardState *base) } =20 if (card->backend =3D=3D 0) { - printf("backend must be one of:\n"); + error_setg(errp, "backend must be one of:"); for (ptable =3D backend_enum_table; ptable->name !=3D NULL; ++ptab= le) { - printf("%s\n", ptable->name); + error_append_hint(errp, "%s\n", ptable->name); } - return -1; + return; } =20 /* TODO: a passthru backened that works on local machine. third card t= ype?*/ @@ -517,34 +518,33 @@ static int emulated_initfn(CCIDCardState *base) if (card->cert1 !=3D NULL && card->cert2 !=3D NULL && card->cert3 = !=3D NULL) { ret =3D emulated_initialize_vcard_from_certificates(card); } else { - printf("%s: you must provide all three certs for" - " certificates backend\n", TYPE_EMULATED_CCID); - return -1; + error_setg(errp, "%s: you must provide all three certs for" + " certificates backend", TYPE_EMULATED_CCID); + return; } } else { if (card->backend !=3D BACKEND_NSS_EMULATED) { - printf("%s: bad backend specified. The options are:\n%s (defau= lt)," - " %s.\n", TYPE_EMULATED_CCID, BACKEND_NSS_EMULATED_NAME, - BACKEND_CERTIFICATES_NAME); - return -1; + error_setg(errp, "%s: bad backend specified. The options are:%= s" + " (default), %s.", TYPE_EMULATED_CCID, + BACKEND_NSS_EMULATED_NAME, BACKEND_CERTIFICATES_NAM= E); + return; } if (card->cert1 !=3D NULL || card->cert2 !=3D NULL || card->cert3 = !=3D NULL) { - printf("%s: unexpected cert parameters to nss emulated backend= \n", - TYPE_EMULATED_CCID); - return -1; + error_setg(errp, "%s: unexpected cert parameters to nss emulat= ed " + "backend", TYPE_EMULATED_CCID); + return; } /* default to mirroring the local hardware readers */ ret =3D wrap_vcard_emul_init(NULL); } if (ret !=3D VCARD_EMUL_OK) { - printf("%s: failed to initialize vcard\n", TYPE_EMULATED_CCID); - return -1; + error_setg(errp, "%s: failed to initialize vcard", TYPE_EMULATED_C= CID); + return; } qemu_thread_create(&card->event_thread_id, "ccid/event", event_thread, card, QEMU_THREAD_JOINABLE); qemu_thread_create(&card->apdu_thread_id, "ccid/apdu", handle_apdu_thr= ead, card, QEMU_THREAD_JOINABLE); - return 0; } =20 static void emulated_exitfn(CCIDCardState *base) @@ -581,7 +581,7 @@ static void emulated_class_initfn(ObjectClass *klass, v= oid *data) DeviceClass *dc =3D DEVICE_CLASS(klass); CCIDCardClass *cc =3D CCID_CARD_CLASS(klass); =20 - cc->initfn =3D emulated_initfn; + cc->realize =3D emulated_realize; cc->exitfn =3D emulated_exitfn; cc->get_atr =3D emulated_get_atr; cc->apdu_from_guest =3D emulated_apdu_from_guest; diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c index 117711862e..b7dd3602dc 100644 --- a/hw/usb/ccid-card-passthru.c +++ b/hw/usb/ccid-card-passthru.c @@ -14,6 +14,7 @@ #include "qemu/error-report.h" #include "qemu/sockets.h" #include "ccid.h" +#include "qapi/error.h" =20 #define DPRINTF(card, lvl, fmt, ...) \ do { \ @@ -337,29 +338,28 @@ static const uint8_t *passthru_get_atr(CCIDCardState = *base, uint32_t *len) return card->atr; } =20 -static int passthru_initfn(CCIDCardState *base) +static void passthru_realize(CCIDCardState *base, Error **errp) { PassthruState *card =3D PASSTHRU_CCID_CARD(base); =20 card->vscard_in_pos =3D 0; card->vscard_in_hdr =3D 0; if (qemu_chr_fe_backend_connected(&card->cs)) { - DPRINTF(card, D_INFO, "initing chardev\n"); + error_setg(errp, "ccid-card-passthru: initing chardev"); qemu_chr_fe_set_handlers(&card->cs, ccid_card_vscard_can_read, ccid_card_vscard_read, ccid_card_vscard_event, NULL, card, NULL, true); ccid_card_vscard_send_init(card); } else { - error_report("missing chardev"); - return -1; + error_setg(errp, "missing chardev"); + return; } card->debug =3D parse_debug_env("QEMU_CCID_PASSTHRU_DEBUG", D_VERBOSE, card->debug); assert(sizeof(DEFAULT_ATR) <=3D MAX_ATR_SIZE); memcpy(card->atr, DEFAULT_ATR, sizeof(DEFAULT_ATR)); card->atr_length =3D sizeof(DEFAULT_ATR); - return 0; } =20 static VMStateDescription passthru_vmstate =3D { @@ -387,7 +387,7 @@ static void passthru_class_initfn(ObjectClass *klass, v= oid *data) DeviceClass *dc =3D DEVICE_CLASS(klass); CCIDCardClass *cc =3D CCID_CARD_CLASS(klass); =20 - cc->initfn =3D passthru_initfn; + cc->realize =3D passthru_realize; cc->get_atr =3D passthru_get_atr; cc->apdu_from_guest =3D passthru_apdu_from_guest; set_bit(DEVICE_CATEGORY_INPUT, dc->categories); diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c index e334d3be11..0092493f4e 100644 --- a/hw/usb/dev-smartcard-reader.c +++ b/hw/usb/dev-smartcard-reader.c @@ -510,14 +510,18 @@ static void ccid_card_exitfn(CCIDCardState *card) =20 } =20 -static int ccid_card_initfn(CCIDCardState *card) +static void ccid_card_initfn(CCIDCardState *card, Error **errp) { CCIDCardClass *cc =3D CCID_CARD_GET_CLASS(card); + Error *local_err =3D NULL; =20 - if (cc->initfn) { - return cc->initfn(card); + if (cc->realize) { + cc->realize(card, &local_err); + if (local_err !=3D NULL) { + error_propagate(errp, local_err); + return; + } } - return 0; } =20 static bool ccid_has_pending_answers(USBCCIDState *s) @@ -1295,27 +1299,28 @@ static int ccid_card_exit(DeviceState *qdev) return 0; } =20 -static int ccid_card_init(DeviceState *qdev) +static void ccid_card_realize(DeviceState *qdev, Error **errp) { CCIDCardState *card =3D CCID_CARD(qdev); USBDevice *dev =3D USB_DEVICE(qdev->parent_bus->parent); USBCCIDState *s =3D USB_CCID_DEV(dev); - int ret =3D 0; + Error *local_err =3D NULL; =20 if (card->slot !=3D 0) { - warn_report("usb-ccid supports one slot, can't add %d", - card->slot); - return -1; + error_setg(errp, "usb-ccid supports one slot, can't add %d", + card->slot); + return; } if (s->card !=3D NULL) { - warn_report("usb-ccid card already full, not adding"); - return -1; + error_setg(errp, "usb-ccid card already full, not adding"); + return; } - ret =3D ccid_card_initfn(card); - if (ret =3D=3D 0) { - s->card =3D card; + ccid_card_initfn(card, &local_err); + if (local_err !=3D NULL) { + error_propagate(errp, local_err); + return; } - return ret; + s->card =3D card; } =20 static void ccid_realize(USBDevice *dev, Error **errp) @@ -1477,7 +1482,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->init =3D ccid_card_init; + k->realize =3D ccid_card_realize; k->exit =3D ccid_card_exit; k->props =3D ccid_props; } --=20 2.15.1 From nobody Thu May 2 02:12:31 2024 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 1516901178816115.97735039196868; Thu, 25 Jan 2018 09:26:18 -0800 (PST) Received: from localhost ([::1]:52922 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eelHv-0005Ki-UY for importer@patchew.org; Thu, 25 Jan 2018 12:26:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60717) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eel6q-0004b4-KQ for qemu-devel@nongnu.org; Thu, 25 Jan 2018 12:14:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eel6p-0004zy-Lc for qemu-devel@nongnu.org; Thu, 25 Jan 2018 12:14:44 -0500 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:33560) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eel6p-0004zq-Gw for qemu-devel@nongnu.org; Thu, 25 Jan 2018 12:14:43 -0500 Received: by mail-qt0-x242.google.com with SMTP id d8so21039874qtm.0 for ; Thu, 25 Jan 2018 09:14:43 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id u23sm2012835qke.88.2018.01.25.09.14.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Jan 2018 09:14:42 -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=avpfXPT4BvJIR1NqUVZGWP9tBTM3mYn1lhwdbU2WoIY=; b=oe9P/9Lnvs+JM5YGSyXqEsPTTFUT0bq9YvX7LWXx39iKBTZ0E5KlRlfoQ76niRIUMp 4jGsPOXUIkx1zlCEEZnNswE7pwbdEClvgivsb43JXyijMAT1A12KNpoDB7VEL64DLEpG YzEn8VtMwOgjDZc3+SqidBSjAtkca3mxXHI+52luwxy4Veeb4vvwaeQ5iO0d4OEngrEf sbPGK4QNKqqZbBUusgwhV29MJJr4yfhN00WV7ojbYk040TDEDg5ipOql0kH3RYbg/gZU pkYhY6eu06z0MFV7MwfW/F4nBYHvpRH7vO/XS7g3F4BQWKLAbxLQVbJ6I0+Oo3GmD5TE qJlQ== 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=avpfXPT4BvJIR1NqUVZGWP9tBTM3mYn1lhwdbU2WoIY=; b=F/2Es7y+i/6kFJKo+ylv2s0MaiDX1wj2NCIXeAm5rQ3FD0N7BqQbAdaoIp4fIpQAqN a2FrEgZ25ewqMNXexl3nyNT7SaNOZr6EPj4GM+xlQ26LEvmHwFrfgrMNIJS7nls5NZyJ EqL8I58r+4+FHVgsBdcUpZvMQngeRdmt8hwM+3YeriH+HGbwUSSBN3RfvnQLhoE56eUm jeyVzVvTvHMpPEfBg991iekqPKesS7MieRjfrbQNl0XBoWZtrWe2unMgwyGAKTJef/n6 lm+lUP8nphFlmawfDC4tULyU7i0Jt1qeJl55bYXxVS8GaudJfyW/l4zCVDfX0+lX/Z0l vaGQ== X-Gm-Message-State: AKwxytfHVwVXbM0SNNtx5RU5Q6jVALCGo861KyGJwE673gGaNfKrioPL D2KLdmlgj3AgmjvU70AMAFY= X-Google-Smtp-Source: AH8x227eOcmIfA8tDZfOQjhMhK8M5bTrN3kwQd4MY5agEAcWjOgS0fBk9cGHMt0BVBFpxAlPJMmQDA== X-Received: by 10.200.48.71 with SMTP id g7mr18443839qte.317.1516900483161; Thu, 25 Jan 2018 09:14:43 -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:31 -0300 Message-Id: <20180125171432.13554-3-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 2/3] usb-ccid: inline ccid_card_initfn() in ccid_card_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: =?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/dev-smartcard-reader.c | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c index 0092493f4e..85f5f2247b 100644 --- a/hw/usb/dev-smartcard-reader.c +++ b/hw/usb/dev-smartcard-reader.c @@ -510,20 +510,6 @@ static void ccid_card_exitfn(CCIDCardState *card) =20 } =20 -static void ccid_card_initfn(CCIDCardState *card, Error **errp) -{ - CCIDCardClass *cc =3D CCID_CARD_GET_CLASS(card); - Error *local_err =3D NULL; - - if (cc->realize) { - cc->realize(card, &local_err); - if (local_err !=3D NULL) { - error_propagate(errp, local_err); - return; - } - } -} - static bool ccid_has_pending_answers(USBCCIDState *s) { return s->pending_answers_num > 0; @@ -1302,6 +1288,7 @@ static int ccid_card_exit(DeviceState *qdev) static void ccid_card_realize(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; @@ -1315,10 +1302,12 @@ static void ccid_card_realize(DeviceState *qdev, Er= ror **errp) error_setg(errp, "usb-ccid card already full, not adding"); return; } - ccid_card_initfn(card, &local_err); - if (local_err !=3D NULL) { - error_propagate(errp, local_err); - return; + if (cc->realize) { + cc->realize(card, &local_err); + if (local_err !=3D NULL) { + error_propagate(errp, local_err); + return; + } } s->card =3D card; } --=20 2.15.1 From nobody Thu May 2 02:12:31 2024 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