From cc847bfd16d894fd8c1a2ce25f31772f6cdbbc74 Mon Sep 17 00:00:00 2001 From: Mao Zhongyi Date: Thu, 25 Jan 2018 14:14:30 -0300 Subject: hw/usb/ccid: Make ccid_card_init() take an error parameter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Philippe Mathieu-Daudé Message-id: 20180125171432.13554-2-f4bug@amsat.org [PMD: fixed s->card assignation in ccid_card_realize()] Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Gerd Hoffmann --- hw/usb/dev-smartcard-reader.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) (limited to 'hw/usb/dev-smartcard-reader.c') 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) } -static int ccid_card_initfn(CCIDCardState *card) +static void ccid_card_initfn(CCIDCardState *card, Error **errp) { CCIDCardClass *cc = CCID_CARD_GET_CLASS(card); + Error *local_err = NULL; - if (cc->initfn) { - return cc->initfn(card); + if (cc->realize) { + cc->realize(card, &local_err); + if (local_err != NULL) { + error_propagate(errp, local_err); + return; + } } - return 0; } static bool ccid_has_pending_answers(USBCCIDState *s) @@ -1295,27 +1299,28 @@ static int ccid_card_exit(DeviceState *qdev) return 0; } -static int ccid_card_init(DeviceState *qdev) +static void ccid_card_realize(DeviceState *qdev, Error **errp) { CCIDCardState *card = CCID_CARD(qdev); USBDevice *dev = USB_DEVICE(qdev->parent_bus->parent); USBCCIDState *s = USB_CCID_DEV(dev); - int ret = 0; + Error *local_err = NULL; if (card->slot != 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 != NULL) { - warn_report("usb-ccid card already full, not adding"); - return -1; + error_setg(errp, "usb-ccid card already full, not adding"); + return; } - ret = ccid_card_initfn(card); - if (ret == 0) { - s->card = card; + ccid_card_initfn(card, &local_err); + if (local_err != NULL) { + error_propagate(errp, local_err); + return; } - return ret; + s->card = card; } static void ccid_realize(USBDevice *dev, Error **errp) @@ -1477,7 +1482,7 @@ static void ccid_card_class_init(ObjectClass *klass, void *data) { DeviceClass *k = DEVICE_CLASS(klass); k->bus_type = TYPE_CCID_BUS; - k->init = ccid_card_init; + k->realize = ccid_card_realize; k->exit = ccid_card_exit; k->props = ccid_props; } -- cgit 1.4.1 From c7516699fc416ed836639dff12115f9d806bfc82 Mon Sep 17 00:00:00 2001 From: Philippe Mathieu-Daudé Date: Thu, 25 Jan 2018 14:14:31 -0300 Subject: usb-ccid: inline ccid_card_initfn() in ccid_card_realize() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Philippe Mathieu-Daudé Message-id: 20180125171432.13554-3-f4bug@amsat.org Signed-off-by: Gerd Hoffmann --- hw/usb/dev-smartcard-reader.c | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) (limited to 'hw/usb/dev-smartcard-reader.c') 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) } -static void ccid_card_initfn(CCIDCardState *card, Error **errp) -{ - CCIDCardClass *cc = CCID_CARD_GET_CLASS(card); - Error *local_err = NULL; - - if (cc->realize) { - cc->realize(card, &local_err); - if (local_err != 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 = CCID_CARD(qdev); + CCIDCardClass *cc = CCID_CARD_GET_CLASS(card); USBDevice *dev = USB_DEVICE(qdev->parent_bus->parent); USBCCIDState *s = USB_CCID_DEV(dev); Error *local_err = NULL; @@ -1315,10 +1302,12 @@ static void ccid_card_realize(DeviceState *qdev, Error **errp) error_setg(errp, "usb-ccid card already full, not adding"); return; } - ccid_card_initfn(card, &local_err); - if (local_err != NULL) { - error_propagate(errp, local_err); - return; + if (cc->realize) { + cc->realize(card, &local_err); + if (local_err != NULL) { + error_propagate(errp, local_err); + return; + } } s->card = card; } -- cgit 1.4.1 From 80ae865468bde918363a123aa26c6fc4385023ac Mon Sep 17 00:00:00 2001 From: Philippe Mathieu-Daudé Date: Thu, 25 Jan 2018 14:14:32 -0300 Subject: usb-ccid: convert CCIDCardClass::exitfn() -> unrealize() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Philippe Mathieu-Daudé Message-id: 20180125171432.13554-4-f4bug@amsat.org Signed-off-by: Gerd Hoffmann --- hw/usb/ccid-card-emulated.c | 4 ++-- hw/usb/ccid-card-passthru.c | 1 + hw/usb/ccid.h | 4 +++- hw/usb/dev-smartcard-reader.c | 25 +++++++++++-------------- 4 files changed, 17 insertions(+), 17 deletions(-) (limited to 'hw/usb/dev-smartcard-reader.c') 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); } -static void emulated_exitfn(CCIDCardState *base) +static void emulated_unrealize(CCIDCardState *base, Error **errp) { EmulatedState *card = EMULATED_CCID_CARD(base); VEvent *vevent = vevent_new(VEVENT_LAST, NULL, NULL); @@ -582,7 +582,7 @@ static void emulated_class_initfn(ObjectClass *klass, void *data) CCIDCardClass *cc = CCID_CARD_CLASS(klass); cc->realize = emulated_realize; - cc->exitfn = emulated_exitfn; + cc->unrealize = emulated_unrealize; cc->get_atr = emulated_get_atr; cc->apdu_from_guest = 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 @@ */ #include "qemu/osdep.h" +#include "qapi/error.h" #include #include "chardev/char-fe.h" #include "qemu/error-report.h" 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; /* 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 *card, } } -static void ccid_card_exitfn(CCIDCardState *card) -{ - CCIDCardClass *cc = 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); } -static int ccid_card_exit(DeviceState *qdev) +static void ccid_card_unrealize(DeviceState *qdev, Error **errp) { CCIDCardState *card = CCID_CARD(qdev); + CCIDCardClass *cc = CCID_CARD_GET_CLASS(card); USBDevice *dev = USB_DEVICE(qdev->parent_bus->parent); USBCCIDState *s = USB_CCID_DEV(dev); + Error *local_err = NULL; 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 != NULL) { + error_propagate(errp, local_err); + return; + } + } s->card = NULL; - return 0; } 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 = DEVICE_CLASS(klass); k->bus_type = TYPE_CCID_BUS; k->realize = ccid_card_realize; - k->exit = ccid_card_exit; + k->unrealize = ccid_card_unrealize; k->props = ccid_props; } -- cgit 1.4.1