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 652566634a711293bcd89391d1c42b82a0865e82..00d93204f988c753d1ba308421936c457277ff25 100644 (file)
--- a/util/event_notifier-posix.c
+++ b/util/event_notifier-posix.c
@@ -29,7 +29,6 @@ void event_notifier_init_fd(EventNotifier *e, int fd)
 {
     e->rfd = fd;
     e->wfd = fd;
-    e->cleanup = NULL;
 }
 #endif
 
@@ -66,7 +65,6 @@ int event_notifier_init(EventNotifier *e, int active)
         e->rfd = fds[0];
         e->wfd = fds[1];
     }
-    e->cleanup = NULL;
     if (active) {
         event_notifier_set(e);
     }
@@ -83,10 +81,9 @@ void event_notifier_cleanup(EventNotifier *e)
     if (e->rfd != e->wfd) {
         close(e->rfd);
     }
-    close(e->wfd);
     e->rfd = -1;
+    close(e->wfd);
     e->wfd = -1;
-    e->cleanup = NULL;
 }
 
 int event_notifier_get_fd(const EventNotifier *e)