diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-04-22 16:17:12 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-04-22 16:17:12 +0100 |
| commit | 53343338a6e7b83777b82803398572b40afc8c0f (patch) | |
| tree | a6b16ffcb414941d0cd6c63d0c7c3050a3a73451 /hw/usb | |
| parent | ee1e0f8e5d3682c561edcdceccff72b9d9b16d8b (diff) | |
| parent | ab27c3b5e7408693dde0b565f050aa55c4a1bcef (diff) | |
| download | qemu-53343338a6e7b83777b82803398572b40afc8c0f.zip qemu-53343338a6e7b83777b82803398572b40afc8c0f.tar.gz qemu-53343338a6e7b83777b82803398572b40afc8c0f.tar.bz2 | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Mirror block job fixes for 2.6.0-rc4
# gpg: Signature made Fri 22 Apr 2016 15:46:41 BST using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
* remotes/kevin/tags/for-upstream:
mirror: Workaround for unexpected iohandler events during completion
aio-posix: Skip external nodes in aio_dispatch
virtio: Mark host notifiers as external
event-notifier: Add "is_external" parameter
iohandler: Introduce iohandler_get_aio_context
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/usb')
| -rw-r--r-- | hw/usb/ccid-card-emulated.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c index 9ddd5ad..3213f9f 100644 --- a/hw/usb/ccid-card-emulated.c +++ b/hw/usb/ccid-card-emulated.c @@ -407,7 +407,7 @@ static int init_event_notifier(EmulatedState *card) DPRINTF(card, 2, "event notifier creation failed\n"); return -1; } - event_notifier_set_handler(&card->notifier, card_event_handler); + event_notifier_set_handler(&card->notifier, false, card_event_handler); return 0; } |