diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2016-10-31 11:58:30 +0000 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2016-10-31 11:58:30 +0000 |
commit | 277d44f5a608055ee51e818837af226de8d015f5 (patch) | |
tree | bbd999ffb6d091866b5ed1c0b49e6ce2c146f5d8 /hw/usb | |
parent | 4178c782f85530d261058abdccc734aa9b7c89ca (diff) | |
parent | 630b210b9abbf362905a2096c22c5eb1d6224e77 (diff) | |
download | qemu-277d44f5a608055ee51e818837af226de8d015f5.zip qemu-277d44f5a608055ee51e818837af226de8d015f5.tar.gz qemu-277d44f5a608055ee51e818837af226de8d015f5.tar.bz2 |
Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-fetch' into staging
trivial patches for 2016-10-28
# gpg: Signature made Fri 28 Oct 2016 16:17:51 BST
# gpg: using RSA key 0x701B4F6B1A693E59
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg: aka "Michael Tokarev <mjt@corpit.ru>"
# gpg: aka "Michael Tokarev <mjt@debian.org>"
# Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D 4324 457C E0A0 8044 65C5
# Subkey fingerprint: 7B73 BAD6 8BE7 A2C2 8931 4B22 701B 4F6B 1A69 3E59
* remotes/mjt/tags/trivial-patches-fetch: (23 commits)
Fix build for less common build directories names
clean-up: removed duplicate #includes
scripts/clean-includes: added duplicate #include check
monitor: deprecate 'default' option
qemu-ga: Remove stray 'q' in documentation
Makefile: Fix help text for target 'installer'
s390: avoid always-true comparison in s390_pci_generate_fid()
migration: Remove unneeded NULL check from migrate_fd_error()
scripts/hxtool: fix undefined behavour of echo
qemu-options.hx: set: fix copy-paste error
usb: Change *_exitfn return type from int to void
MAINTAINERS: qemu-trivial information
colo-compare: remove unused struct CompareChardevProps and 'props' variable
milkymist-pfpu: fix potential integer overflow
hw/block/nvme: Simplify if-statements a little bit
target-lm32: rewrite gen_compare()
lm32: milkymist-tmu2: fix integer overflow
target-lm32: disable asm logging via LOG_DIS()
target-lm32: swap operand of wcsr in LOG_DIS()
target-lm32: fix LOG_DIS operand order
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/usb')
-rw-r--r-- | hw/usb/ccid-card-emulated.c | 3 | ||||
-rw-r--r-- | hw/usb/ccid-card-passthru.c | 6 | ||||
-rw-r--r-- | hw/usb/ccid.h | 2 | ||||
-rw-r--r-- | hw/usb/dev-mtp.c | 1 | ||||
-rw-r--r-- | hw/usb/dev-smartcard-reader.c | 11 |
5 files changed, 7 insertions, 16 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 325129a..88cb6d8 100644 --- a/hw/usb/ccid-card-passthru.c +++ b/hw/usb/ccid-card-passthru.c @@ -365,11 +365,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, @@ -396,7 +391,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-mtp.c b/hw/usb/dev-mtp.c index 58d95ff..9cb0f50 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -17,7 +17,6 @@ #include <sys/statvfs.h> #ifdef CONFIG_INOTIFY1 #include <sys/inotify.h> -#include "qapi/error.h" #include "qemu/main-loop.h" #endif diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c index af4b851..89e11b6 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) |