Revert "qemu: add a cleanup callback function to EventNotifier"

This reverts commit f87d72f as that is
part of a patchset reported to break cleanup and migration.

Cc: Gal Hammer <[email protected]>
Cc: Sitong Liu <[email protected]>
Cc: Xiaoling Gao <[email protected]>
Suggested-by: Greg Kurz <[email protected]>
Suggested-by: Paolo Bonzini <[email protected]>
Reported-by: Jose Ricardo Ziviani <[email protected]>
Reported-by: Daniel Henrique Barboza <[email protected]>

Author: mstsirkin

include/qemu/event_notifier.h

@@ -26,7 +26,6 @@ struct EventNotifier {
     int rfd;
     int wfd;
 #endif
-    void (*cleanup)(EventNotifier *);
 };
 
 typedef void EventNotifierHandler(EventNotifier *);

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);
     }
@@ -82,11 +80,10 @@ void event_notifier_cleanup(EventNotifier *e)
 {
     if (e->rfd != e->wfd) {
         close(e->rfd);
+        e->rfd = -1;
     }
     close(e->wfd);
-    e->rfd = -1;
     e->wfd = -1;
-    e->cleanup = NULL;
 }
 
 int event_notifier_get_fd(const EventNotifier *e)

util/event_notifier-win32.c

@@ -19,15 +19,13 @@ int event_notifier_init(EventNotifier *e, int active)
 {
     e->event = CreateEvent(NULL, TRUE, FALSE, NULL);
     assert(e->event);
-    e->cleanup = NULL;
     return 0;
 }
 
 void event_notifier_cleanup(EventNotifier *e)
 {
     CloseHandle(e->event);
     e->event = NULL;
-    e->cleanup = NULL;
 }
 
 HANDLE event_notifier_get_handle(EventNotifier *e)