From nobody Wed Feb 11 02:53:59 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 151662300547090.72554851288169; Mon, 22 Jan 2018 04:10:05 -0800 (PST) Received: from localhost ([::1]:38128 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edavM-00005I-KF for importer@patchew.org; Mon, 22 Jan 2018 07:10:04 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52649) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edapg-00041V-3g for qemu-devel@nongnu.org; Mon, 22 Jan 2018 07:04:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1edapc-0000Ge-U2 for qemu-devel@nongnu.org; Mon, 22 Jan 2018 07:04:12 -0500 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:46863) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1edapc-0000GV-Pd for qemu-devel@nongnu.org; Mon, 22 Jan 2018 07:04:08 -0500 Received: by mail-qt0-x242.google.com with SMTP id o35so20000274qtj.13 for ; Mon, 22 Jan 2018 04:04:08 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id 92sm11295356qky.72.2018.01.22.04.04.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Jan 2018 04:04:07 -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=R4Y0EEwYfv73OmkJnXoyQruq5uuVnwczWMuvokw0CaY=; b=HRHIq35ctxb5kKtM08AeLaVWuUBn8G8q2vJNo0dxr2Qu+A/271yhqUb2Vj0tZwhA6m LFMtJZxc3FTBKpH10DFU+8D55ZvxmP9XsuiNK+trPfIuP3cRYE1e4GbDKgXfnIzf0nab /fBG+w2o+M1oJOvvjKZtxyphGhBsdyBW3JXG7LKC1F3hQatWCA8LSKkSowUeSo1aWKXq IknBKbDnZCSTGuHJMA1hxKGI0H7PyyE2s9y7jt1JSw0Nf7tyHZwoxyVWuVw2gJ5iFvfo aSfonBO7R2R3aECVakbxgxoLnSrr99GqMoLOMRYI1xMLdFiJ5bguvdKZcav6lRrdYy95 4+9g== 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=R4Y0EEwYfv73OmkJnXoyQruq5uuVnwczWMuvokw0CaY=; b=Uw95jJXiQ2fLNerrTJ9SW+TCSJDACs8/2wECgWkhlZlXMyl0fs1us61Z0dzD/l8VK+ mLZIdJTTwXbabxK4qD+j6/MeVs0iWiiiibwr3GkypO5ImMk+Da6bbXlpfPgiZRBtXn0+ NBgRx2FEkrKSZ2c7YZEj7i2i6j7+p3xFJbrbsZOhgXmwxaxmQTPzCyx0OTwI2co2XyyV 8/GaDW8Pt0ftwbn8eMlGMyxOj+DWDOHkCr4vBcVCpz1QSuin+96AeeoJGAGMLBuXn2y/ szJGVu/j0jXYwHfwGtxeWDpWIGL3xfTgv9QYolPx+P7qnJDAxIBmAP81kN/WoNn2Xh4j G8gw== X-Gm-Message-State: AKwxyteayUSafweRVG04VS7ke6fWGX3qAZ7g8j4EiYFJHDQts4i87tMd XZ6hAZK5611z83CzduY89bQ= X-Google-Smtp-Source: AH8x226wapn10awef/gQAME5/I4f/S2CBWGQRe4iPAZVjtS4CAm3Q+EKAb2OirwPrEuVrznpJMQq1A== X-Received: by 10.200.47.108 with SMTP id k41mr10435195qta.151.1516622648218; Mon, 22 Jan 2018 04:04:08 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Eduardo Habkost , Paolo Bonzini Date: Mon, 22 Jan 2018 09:03:47 -0300 Message-Id: <20180122120351.22369-4-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180122120351.22369-1-f4bug@amsat.org> References: <20180122120351.22369-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 v2 3/7] usb-ccid: convert CCIDCardClass::init -> 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: Peter Maydell , Thomas Huth , qemu-devel@nongnu.org, Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann 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 | 9 +++++-- hw/usb/ccid-card-emulated.c | 45 ++++++++++++++++++---------------- hw/usb/ccid-card-passthru.c | 10 ++++---- hw/usb/dev-smartcard-reader.c | 57 +++++++++++++++------------------------= ---- 4 files changed, 56 insertions(+), 65 deletions(-) diff --git a/hw/usb/ccid.h b/hw/usb/ccid.h index 1f070116d6..11056b91ee 100644 --- a/hw/usb/ccid.h +++ b/hw/usb/ccid.h @@ -28,20 +28,25 @@ typedef struct CCIDCardInfo CCIDCardInfo; * into the smartcard device (hw/ccid-card-*.c) */ typedef struct CCIDCardClass { + /*< private >*/ DeviceClass parent_class; + /*< public >*/ + + void (*realize)(CCIDCardState *card, Error **errp); + void (*unrealize)(CCIDCardState *card, Error **errp); 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); - int (*initfn)(CCIDCardState *card); } CCIDCardClass; =20 /* * state of the CCID Card device (i.e. hw/ccid-card-*.c) */ struct CCIDCardState { + /*< private >*/ DeviceState qdev; + /*< public >*/ uint32_t slot; /* For future use with multiple slot reader. */ }; =20 diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c index e646eb243b..a2b608a953 100644 --- a/hw/usb/ccid-card-emulated.c +++ b/hw/usb/ccid-card-emulated.c @@ -27,6 +27,7 @@ */ =20 #include "qemu/osdep.h" +#include "qapi/error.h" #include #include #include @@ -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; @@ -495,7 +496,8 @@ static int emulated_initfn(CCIDCardState *base) card->reader =3D NULL; card->quit_apdu_thread =3D 0; if (init_event_notifier(card) < 0) { - return -1; + error_setg(errp, TYPE_EMULATED_CCID ": event notifier creation fai= led"); + return; } =20 card->backend =3D 0; @@ -505,11 +507,12 @@ static int emulated_initfn(CCIDCardState *base) } =20 if (card->backend =3D=3D 0) { - printf("backend must be one of:\n"); + error_setg(errp, TYPE_EMULATED_CCID ": no backend specified."); + error_append_hint(errp, "backend must be one of:\n"); 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,37 +520,37 @@ 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, TYPE_EMULATED_CCID ": you must provide all th= ree " + "certs for certificates backend"); + 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, TYPE_EMULATED_CCID ": no backend specified."); + error_append_hint(errp, "The options are: %s (default), %s.", + BACKEND_NSS_EMULATED_NAME, + BACKEND_CERTIFICATES_NAME); + 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, TYPE_EMULATED_CCID ": unexpected cert paramet= ers " + "to nss emulated backend"); + 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, TYPE_EMULATED_CCID ": failed to initialize vcard"= ); + 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) +static void emulated_unrealize(CCIDCardState *base, Error **errp) { EmulatedState *card =3D EMULATED_CCID_CARD(base); VEvent *vevent =3D vevent_new(VEVENT_LAST, NULL, NULL); @@ -581,8 +584,8 @@ 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->exitfn =3D emulated_exitfn; + cc->realize =3D emulated_realize; + 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 117711862e..844ad2f878 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" @@ -337,7 +338,7 @@ static const uint8_t *passthru_get_atr(CCIDCardState *b= ase, 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 @@ -351,15 +352,14 @@ static int passthru_initfn(CCIDCardState *base) 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..e36b190118 100644 --- a/hw/usb/dev-smartcard-reader.c +++ b/hw/usb/dev-smartcard-reader.c @@ -37,7 +37,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu-common.h" -#include "qemu/error-report.h" #include "hw/usb.h" #include "hw/usb/desc.h" =20 @@ -500,26 +499,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 int ccid_card_initfn(CCIDCardState *card) -{ - CCIDCardClass *cc =3D CCID_CARD_GET_CLASS(card); - - if (cc->initfn) { - return cc->initfn(card); - } - return 0; -} - static bool ccid_has_pending_answers(USBCCIDState *s) { return s->pending_answers_num > 0; @@ -1281,41 +1260,45 @@ 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); =20 if (ccid_card_inserted(s)) { ccid_card_card_removed(card); } - ccid_card_exitfn(card); + if (cc->unrealize) { + cc->unrealize(card, errp); + } s->card =3D NULL; - 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); + CCIDCardClass *cc =3D CCID_CARD_GET_CLASS(card); USBDevice *dev =3D USB_DEVICE(qdev->parent_bus->parent); USBCCIDState *s =3D USB_CCID_DEV(dev); - int ret =3D 0; =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; + if (cc->realize) { + cc->realize(card, errp); + if (errp && *errp) { + return; + } } - return ret; + s->card =3D card; } =20 static void ccid_realize(USBDevice *dev, Error **errp) @@ -1477,8 +1460,8 @@ 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->exit =3D ccid_card_exit; + k->realize =3D ccid_card_realize; + k->unrealize =3D ccid_card_unrealize; k->props =3D ccid_props; } =20 --=20 2.15.1