summary refs log tree commit diff stats
path: root/include/qemu/main-loop.h
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-06-27 18:32:49 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2017-07-04 14:39:28 +0200
commitde5f852f38d644edf995a810c34b4d24dbfbd740 (patch)
tree7fc3fd2adb94c8d2d029007b7eecce6ac70d7cde /include/qemu/main-loop.h
parentbe59df797c6f465ef4f028fc2519efd2cfed4d30 (diff)
downloadfocaccia-qemu-de5f852f38d644edf995a810c34b4d24dbfbd740.tar.gz
focaccia-qemu-de5f852f38d644edf995a810c34b4d24dbfbd740.zip
main_loop: Make main_loop_wait() return void
The last users of main_loop_wait() that cared about the return value
have now been changed to no longer use it. Drop the now-useless return
value and make the function return void.

We avoid the awkwardness of ifdeffery to handle the 'ret'
variable in main_loop_wait() only being wanted if CONFIG_SLIRP
by simply dropping all the ifdefs. There are stub implementations
of slirp_pollfds_poll() and slirp_pollfds_fill() already in
stubs/slirp.c which do nothing, as required.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <1498584769-12439-3-git-send-email-peter.maydell@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'include/qemu/main-loop.h')
-rw-r--r--include/qemu/main-loop.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/qemu/main-loop.h b/include/qemu/main-loop.h
index d7e24af78d..6b4b60bf6d 100644
--- a/include/qemu/main-loop.h
+++ b/include/qemu/main-loop.h
@@ -79,7 +79,7 @@ int qemu_init_main_loop(Error **errp);
  *
  * @nonblocking: Whether the caller should block until an event occurs.
  */
-int main_loop_wait(int nonblocking);
+void main_loop_wait(int nonblocking);
 
 /**
  * qemu_get_aio_context: Return the main loop's AioContext