* [Qemu-devel] [PATCH v3] usb: Change *_exitfn return type from int to void
@ 2016-10-13 20:21 Akanksha Srivastava
2016-10-16 10:27 ` Stefan Hajnoczi
2016-10-16 14:17 ` Michael Tokarev
0 siblings, 2 replies; 3+ messages in thread
From: Akanksha Srivastava @ 2016-10-13 20:21 UTC (permalink / raw
To: qemu-devel; +Cc: qemu-trivial, kraxel, Akanksha Srivastava
The *_exitfn functions cannot fail and should not be
returning int.
This also removes the passthru_exitfn since this callback
does nothing as of now.
This was suggested as a Bite-sized task for code cleanup.
Signed-off-by: Akanksha Srivastava <akanksha.dlf@gmail.com>
---
hw/usb/ccid-card-emulated.c | 3 +--
hw/usb/ccid-card-passthru.c | 6 ------
hw/usb/ccid.h | 2 +-
hw/usb/dev-smartcard-reader.c | 11 +++++------
4 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c
index 3213f9f..eceb5f3 100644
--- a/hw/usb/ccid-card-emulated.c
+++ b/hw/usb/ccid-card-emulated.c
@@ -547,7 +547,7 @@ static int emulated_initfn(CCIDCardState *base)
return 0;
}
-static int emulated_exitfn(CCIDCardState *base)
+static void emulated_exitfn(CCIDCardState *base)
{
EmulatedState *card = EMULATED_CCID_CARD(base);
VEvent *vevent = vevent_new(VEVENT_LAST, NULL, NULL);
@@ -564,7 +564,6 @@ static int emulated_exitfn(CCIDCardState *base)
qemu_mutex_destroy(&card->handle_apdu_mutex);
qemu_mutex_destroy(&card->vreader_mutex);
qemu_mutex_destroy(&card->event_list_mutex);
- return 0;
}
static Property emulated_card_properties[] = {
diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c
index 2eacea7..7209f73 100644
--- a/hw/usb/ccid-card-passthru.c
+++ b/hw/usb/ccid-card-passthru.c
@@ -364,11 +364,6 @@ static int passthru_initfn(CCIDCardState *base)
return 0;
}
-static int passthru_exitfn(CCIDCardState *base)
-{
- return 0;
-}
-
static VMStateDescription passthru_vmstate = {
.name = "ccid-card-passthru",
.version_id = 1,
@@ -395,7 +390,6 @@ static void passthru_class_initfn(ObjectClass *klass, void *data)
CCIDCardClass *cc = CCID_CARD_CLASS(klass);
cc->initfn = passthru_initfn;
- cc->exitfn = passthru_exitfn;
cc->get_atr = passthru_get_atr;
cc->apdu_from_guest = passthru_apdu_from_guest;
set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
diff --git a/hw/usb/ccid.h b/hw/usb/ccid.h
index 9334da8..1f07011 100644
--- a/hw/usb/ccid.h
+++ b/hw/usb/ccid.h
@@ -33,7 +33,7 @@ typedef struct CCIDCardClass {
void (*apdu_from_guest)(CCIDCardState *card,
const uint8_t *apdu,
uint32_t len);
- int (*exitfn)(CCIDCardState *card);
+ void (*exitfn)(CCIDCardState *card);
int (*initfn)(CCIDCardState *card);
} CCIDCardClass;
diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c
index af4b851..e1940ad 100644
--- a/hw/usb/dev-smartcard-reader.c
+++ b/hw/usb/dev-smartcard-reader.c
@@ -508,14 +508,14 @@ static void ccid_card_apdu_from_guest(CCIDCardState *card,
}
}
-static int ccid_card_exitfn(CCIDCardState *card)
+static void ccid_card_exitfn(CCIDCardState *card)
{
CCIDCardClass *cc = CCID_CARD_GET_CLASS(card);
if (cc->exitfn) {
- return cc->exitfn(card);
+ cc->exitfn(card);
}
- return 0;
+
}
static int ccid_card_initfn(CCIDCardState *card)
@@ -1279,7 +1279,6 @@ void ccid_card_card_inserted(CCIDCardState *card)
static int ccid_card_exit(DeviceState *qdev)
{
- int ret = 0;
CCIDCardState *card = CCID_CARD(qdev);
USBDevice *dev = USB_DEVICE(qdev->parent_bus->parent);
USBCCIDState *s = USB_CCID_DEV(dev);
@@ -1287,9 +1286,9 @@ static int ccid_card_exit(DeviceState *qdev)
if (ccid_card_inserted(s)) {
ccid_card_card_removed(card);
}
- ret = ccid_card_exitfn(card);
+ ccid_card_exitfn(card);
s->card = NULL;
- return ret;
+ return 0;
}
static int ccid_card_init(DeviceState *qdev)
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH v3] usb: Change *_exitfn return type from int to void
2016-10-13 20:21 [Qemu-devel] [PATCH v3] usb: Change *_exitfn return type from int to void Akanksha Srivastava
@ 2016-10-16 10:27 ` Stefan Hajnoczi
2016-10-16 14:17 ` Michael Tokarev
1 sibling, 0 replies; 3+ messages in thread
From: Stefan Hajnoczi @ 2016-10-16 10:27 UTC (permalink / raw
To: Akanksha Srivastava; +Cc: qemu-devel, qemu-trivial, kraxel
[-- Attachment #1: Type: text/plain, Size: 638 bytes --]
On Fri, Oct 14, 2016 at 01:51:31AM +0530, Akanksha Srivastava wrote:
> The *_exitfn functions cannot fail and should not be
> returning int.
> This also removes the passthru_exitfn since this callback
> does nothing as of now.
> This was suggested as a Bite-sized task for code cleanup.
> Signed-off-by: Akanksha Srivastava <akanksha.dlf@gmail.com>
> ---
> hw/usb/ccid-card-emulated.c | 3 +--
> hw/usb/ccid-card-passthru.c | 6 ------
> hw/usb/ccid.h | 2 +-
> hw/usb/dev-smartcard-reader.c | 11 +++++------
> 4 files changed, 7 insertions(+), 15 deletions(-)
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 455 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH v3] usb: Change *_exitfn return type from int to void
2016-10-13 20:21 [Qemu-devel] [PATCH v3] usb: Change *_exitfn return type from int to void Akanksha Srivastava
2016-10-16 10:27 ` Stefan Hajnoczi
@ 2016-10-16 14:17 ` Michael Tokarev
1 sibling, 0 replies; 3+ messages in thread
From: Michael Tokarev @ 2016-10-16 14:17 UTC (permalink / raw
To: Akanksha Srivastava, qemu-devel; +Cc: qemu-trivial, kraxel
13.10.2016 23:21, Akanksha Srivastava wrote:
> The *_exitfn functions cannot fail and should not be
> returning int.
...
Applied to -trivial, thank you!
/mjt
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-10-16 14:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-13 20:21 [Qemu-devel] [PATCH v3] usb: Change *_exitfn return type from int to void Akanksha Srivastava
2016-10-16 10:27 ` Stefan Hajnoczi
2016-10-16 14:17 ` Michael Tokarev
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.