haraldwolff
/
qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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

Cc: Gal Hammer <ghammer@redhat.com>
Cc: Sitong Liu <siliu@redhat.com>
Cc: Xiaoling Gao <xiagao@redhat.com>
Suggested-by: Greg Kurz <groug@kaod.org>
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Reported-by: Jose Ricardo Ziviani <joserz@linux.vnet.ibm.com>
Reported-by: Daniel Henrique Barboza <danielhb@linux.vnet.ibm.com>
stable-2.12
Michael S. Tsirkin 2018-01-24 19:11:47 +02:00
parent 1ef8185a06
commit e044c0f8dd
3 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/qemu/event_notifier.h
View File

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

5
util/event_notifier-posix.c
View File

@ -29,7 +29,6 @@ void event_notifier_init_fd(EventNotifier *e, int fd)
{ {
e->rfd = fd; e->rfd = fd;
e->wfd = fd; e->wfd = fd;
e->cleanup = NULL;
} }
#endif #endif
@ -66,7 +65,6 @@ int event_notifier_init(EventNotifier *e, int active)
e->rfd = fds[0]; e->rfd = fds[0];
e->wfd = fds[1]; e->wfd = fds[1];
} }
e->cleanup = NULL;
if (active) { if (active) {
event_notifier_set(e); event_notifier_set(e);
} }
@ -82,11 +80,10 @@ void event_notifier_cleanup(EventNotifier *e)
{ {
if (e->rfd != e->wfd) { if (e->rfd != e->wfd) {
close(e->rfd); close(e->rfd);
e->rfd = -1;
} }
close(e->wfd); close(e->wfd);
e->rfd = -1;
e->wfd = -1; e->wfd = -1;
e->cleanup = NULL;
} }
int event_notifier_get_fd(const EventNotifier *e) int event_notifier_get_fd(const EventNotifier *e)

2
util/event_notifier-win32.c
View File

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