diff options
| author | Peter Maydell | 2015-06-12 16:39:05 +0200 |
|---|---|---|
| committer | Peter Maydell | 2015-06-12 16:39:05 +0200 |
| commit | 0a2df857a7038c75379cc575de5d4be4c0ac629e (patch) | |
| tree | 700646940e9fe7ea5db58e88289d4f333083d4ad /util/event_notifier-posix.c | |
| parent | Merge remote-tracking branch 'remotes/aurel/tags/pull-sh4-next-20150612' into... (diff) | |
| parent | qmp/hmp: add rocker device support (diff) | |
| download | qemu-0a2df857a7038c75379cc575de5d4be4c0ac629e.tar.gz qemu-0a2df857a7038c75379cc575de5d4be4c0ac629e.tar.xz qemu-0a2df857a7038c75379cc575de5d4be4c0ac629e.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging
# gpg: Signature made Fri Jun 12 13:57:20 2015 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
* remotes/stefanha/tags/net-pull-request:
qmp/hmp: add rocker device support
rocker: bring link up/down on PHY enable/disable
rocker: update tests using hw-derived interface names
rocker: Add support for phys name
iohandler: Change return type of qemu_set_fd_handler to "void"
event-notifier: Always return 0 for posix implementation
xen_backend: Remove unused error handling of qemu_set_fd_handler
oss: Remove unused error handling of qemu_set_fd_handler
alsaaudio: Remove unused error handling of qemu_set_fd_handler
main-loop: Drop qemu_set_fd_handler2
Change qemu_set_fd_handler2(..., NULL, ...) to qemu_set_fd_handler
tap: Drop tap_can_send
net/socket: Drop net_socket_can_send
netmap: Drop netmap_can_send
l2tpv3: Drop l2tpv3_can_send
stubs: Add qemu_set_fd_handler
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'util/event_notifier-posix.c')
| -rw-r--r-- | util/event_notifier-posix.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/util/event_notifier-posix.c b/util/event_notifier-posix.c index 8442c6e63c..ed4ca2b01e 100644 --- a/util/event_notifier-posix.c +++ b/util/event_notifier-posix.c @@ -85,7 +85,8 @@ int event_notifier_get_fd(EventNotifier *e) int event_notifier_set_handler(EventNotifier *e, EventNotifierHandler *handler) { - return qemu_set_fd_handler(e->rfd, (IOHandler *)handler, NULL, e); + qemu_set_fd_handler(e->rfd, (IOHandler *)handler, NULL, e); + return 0; } int event_notifier_set(EventNotifier *e) |