From nobody Sat May 4 23:36:20 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1515897408628791.101460013083; Sat, 13 Jan 2018 18:36:48 -0800 (PST) Received: from localhost ([::1]:58002 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eaYA2-0000HT-7Y for importer@patchew.org; Sat, 13 Jan 2018 21:36:38 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58685) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eaY92-0008LI-Gq for qemu-devel@nongnu.org; Sat, 13 Jan 2018 21:35:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eaY8z-0003Q3-8x for qemu-devel@nongnu.org; Sat, 13 Jan 2018 21:35:36 -0500 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:42035) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eaY8z-0003PS-2d for qemu-devel@nongnu.org; Sat, 13 Jan 2018 21:35:33 -0500 Received: by mail-qt0-x241.google.com with SMTP id c2so10506492qtn.9 for ; Sat, 13 Jan 2018 18:35:32 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id y65sm15872335qke.24.2018.01.13.18.35.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 13 Jan 2018 18:35:31 -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:mime-version :content-transfer-encoding; bh=mcCrxS9DigQPzbSmgQ81fo4Lfh3bwv68KedB2w8ZdSo=; b=q5aXBnrNkJUL8siC+DDOJhUoNtXhLu3LuQjlwhDohdCrUc0CAGtKjjW57VgJ2uz933 X5BHJxn8ej0yDr+SoX5/aw6Sed14FM/UbtRCh92ATKhfKXrIPx/7oXTu+LZqJuwiAe0V 3pbZLWSfDTtmor9wrDkoSRsYJmc/VJwqCzluDT/iiR+h1BG18KkhZywL6YvsP66JC956 FSrzscYCbzsf4KDdkv8aTKvBrlfgAkMDN3BwZbVADFnb6eh+8k1REI6EhVsKr87OmHwy jxwi4sj/iD9HvgfTdWg34KIdvaIoLFJfAknElIij/wKWSQpMGIDMq48/CeT9XNTsI8eM cezg== 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 :mime-version:content-transfer-encoding; bh=mcCrxS9DigQPzbSmgQ81fo4Lfh3bwv68KedB2w8ZdSo=; b=FMJyG6yt3IUYporuXhrxwdDgQbwM8SCd2XcPA60Eqki8pO/Wz3zJIqmuTS8xZuiBnm nWOAi/aGppYmv5p0MYfgWxcDE3GzS7k7lz2ndehWHEiZmIAnRgyuVL+fPkrEqd9t7t2a USmfWH6wjQrY62Z1BGwugqLS+MPfnghnQ4C69B6ho15s4ifpQPC9SK+AZf12F0jJdmg+ TetU3wbA60VpQ2KwGOBiHemFP49jpOCBJmnmQif5LA56DU6HdO4E73qa+NOTeweaZk8E HViIyPDjH02C3g5g54qzdpGd6H7xjzzyS5YSO3QS64F/B4wYEw2nJUtU9dzArGYr69TS H/xg== X-Gm-Message-State: AKwxytf5EvR1exrhjCUbKTf0kdcBWAcYrxi6ND6ZHKepgStsruRA4w3S dVsgqHVgvd3bUPC5twJywko= X-Google-Smtp-Source: ACJfBouNsqJBjhCVTf6cvAcXOu4/kBn5hFlnNmVAfWsfKzsOc6943Gw0pNGQQzWebyKQGMjrEx6jLg== X-Received: by 10.200.37.167 with SMTP id e36mr41099323qte.320.1515897332351; Sat, 13 Jan 2018 18:35:32 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Gerd Hoffmann Date: Sat, 13 Jan 2018 23:35:08 -0300 Message-Id: <20180114023508.27838-1-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 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::241 Subject: [Qemu-devel] [PATCH] usb-ccid: QOM'ify 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 | 9 +++++-- hw/usb/ccid-card-emulated.c | 48 +++++++++++++++++++----------------- hw/usb/ccid-card-passthru.c | 13 +++++----- hw/usb/dev-smartcard-reader.c | 57 +++++++++++++++------------------------= ---- 4 files changed, 60 insertions(+), 67 deletions(-) diff --git a/hw/usb/ccid.h b/hw/usb/ccid.h index 1f070116d6..d9a1cbd09f 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 >*/ + DeviceRealize parent_realize; + DeviceUnrealize parent_unrealize; + 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..db2ed53773 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,9 +481,9 @@ static uint32_t parse_enumeration(char *str, return ret; } =20 -static int emulated_initfn(CCIDCardState *base) +static void emulated_realize(DeviceState *dev, Error **errp) { - EmulatedState *card =3D EMULATED_CCID_CARD(base); + EmulatedState *card =3D EMULATED_CCID_CARD(dev); VCardEmulError ret; const EnumTable *ptable; =20 @@ -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."); + printf("backend must be one of:\n"); /* TODO remove */ for (ptable =3D backend_enum_table; ptable->name !=3D NULL; ++ptab= le) { printf("%s\n", ptable->name); } - return -1; + return; } =20 /* TODO: a passthru backened that works on local machine. third card t= ype?*/ @@ -517,39 +520,38 @@ 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 ": bad backend specified. " + "The options are: %s (default), %s.", + 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, 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(DeviceState *dev, Error **errp) { - EmulatedState *card =3D EMULATED_CCID_CARD(base); + EmulatedState *card =3D EMULATED_CCID_CARD(dev); VEvent *vevent =3D vevent_new(VEVENT_LAST, NULL, NULL); =20 vevent_queue_vevent(vevent); /* stop vevent thread */ @@ -581,8 +583,10 @@ static void emulated_class_initfn(ObjectClass *klass, = void *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->parent_realize =3D dc->realize; + dc->realize =3D emulated_realize; + cc->parent_unrealize =3D dc->unrealize; + dc->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..50393f859e 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,9 +338,9 @@ 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(DeviceState *dev, Error **errp) { - PassthruState *card =3D PASSTHRU_CCID_CARD(base); + PassthruState *card =3D PASSTHRU_CCID_CARD(dev); =20 card->vscard_in_pos =3D 0; card->vscard_in_hdr =3D 0; @@ -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,8 @@ 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->parent_realize =3D dc->realize; + dc->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..cbd00645c3 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->parent_unrealize) { + cc->parent_unrealize(qdev, 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->parent_realize) { + cc->parent_realize(qdev, 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