Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

[qemu.git] / util / event_notifier-posix.c

diff --git a/util/event_notifier-posix.c b/util/event_notifier-posix.c
index 713d7560d0abd8f349b6a86ebc5def1bd6f49cdf..73c4046b587184f9110fa1a1e4d6a974f3512c03 100644 (file)
--- a/util/event_notifier-posix.c
+++ b/util/event_notifier-posix.c
@@ -10,20 +10,27 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
+#include "qemu/cutils.h"
 #include "qemu/event_notifier.h"
-#include "char/char.h"
 #include "qemu/main-loop.h"
 
 #ifdef CONFIG_EVENTFD
 #include <sys/eventfd.h>
 #endif
 
+#ifdef CONFIG_EVENTFD
+/*
+ * Initialize @e with existing file descriptor @fd.
+ * @fd must be a genuine eventfd object, emulation with pipe won't do.
+ */
 void event_notifier_init_fd(EventNotifier *e, int fd)
 {
     e->rfd = fd;
     e->wfd = fd;
 }
+#endif
 
 int event_notifier_init(EventNotifier *e, int active)
 {
@@ -73,21 +80,17 @@ void event_notifier_cleanup(EventNotifier *e)
 {
     if (e->rfd != e->wfd) {
         close(e->rfd);
+        e->rfd = -1;
     }
     close(e->wfd);
+    e->wfd = -1;
 }
 
-int event_notifier_get_fd(EventNotifier *e)
+int event_notifier_get_fd(const EventNotifier *e)
 {
     return e->rfd;
 }
 
-int event_notifier_set_handler(EventNotifier *e,
-                               EventNotifierHandler *handler)
-{
-    return qemu_set_fd_handler(e->rfd, (IOHandler *)handler, NULL, e);
-}
-
 int event_notifier_set(EventNotifier *e)
 {
     static const uint64_t value = 1;