Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20191111' into...

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

diff --git a/util/event_notifier-posix.c b/util/event_notifier-posix.c
index 2e30e74bd63f800dbd520b37cbf64d1ca016d08f..00d93204f988c753d1ba308421936c457277ff25 100644 (file)
--- a/util/event_notifier-posix.c
+++ b/util/event_notifier-posix.c
@@ -12,19 +12,25 @@
 
 #include "qemu/osdep.h"
 #include "qemu-common.h"
+#include "qemu/cutils.h"
 #include "qemu/event_notifier.h"
-#include "sysemu/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)
 {
@@ -75,7 +81,9 @@ 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(const EventNotifier *e)
@@ -83,13 +91,6 @@ int event_notifier_get_fd(const EventNotifier *e)
     return e->rfd;
 }
 
-int event_notifier_set_handler(EventNotifier *e,
-                               EventNotifierHandler *handler)
-{
-    qemu_set_fd_handler(e->rfd, (IOHandler *)handler, NULL, e);
-    return 0;
-}
-
 int event_notifier_set(EventNotifier *e)
 {
     static const uint64_t value = 1;