diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-01-24 19:24:26 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-01-24 19:24:26 +0000 |
| commit | 834a336eb911db8a8ca00e760ee6a85faca19414 (patch) | |
| tree | 164006825d183ae89b986b9f3585cc3b404a1ae4 /include | |
| parent | 82de978a8b01c37e57a4782012b88ce89e0fa4f6 (diff) | |
| parent | e044c0f8dd028ea296396ad8066ba436e9acf350 (diff) | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
virtio: quick fix
Fixes a regression in virtio that's causing issues
for many people.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Wed 24 Jan 2018 17:20:24 GMT
# gpg: using RSA key 0x281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg: aka "Michael S. Tsirkin <mst@redhat.com>"
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17 0970 C350 3912 AFBE 8E67
# Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA 8A0D 281F 0DB8 D28D 5469
* remotes/mst/tags/for_upstream:
Revert "qemu: add a cleanup callback function to EventNotifier"
Revert "virtio: postpone the execution of event_notifier_cleanup function"
Revert "virtio: improve virtio devices initialization time"
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/qemu/event_notifier.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/qemu/event_notifier.h b/include/qemu/event_notifier.h index b30a45474f..599c99f1a5 100644 --- a/include/qemu/event_notifier.h +++ b/include/qemu/event_notifier.h @@ -26,7 +26,6 @@ struct EventNotifier { int rfd; int wfd; #endif - void (*cleanup)(EventNotifier *); }; typedef void EventNotifierHandler(EventNotifier *); |