mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

main-loop: Fix SetEvent() on uninitialized handle on win32

Browse Source 
The __attribute__((constructor)) init_main_loop() automatically get
called if qemu-tool.o is linked in. On win32, this leads to
a qemu_notify_event() call which attempts to SetEvent() on a HANDLE that
won't be initialized until qemu_init_main_loop() is manually called,
breaking qemu-tools.o programs on Windows at runtime.

This patch checks for an initialized event handle before attempting to
set it, which is analoguous to how we deal with an unitialized
io_thread_fd in the posix implementation.

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Michael Roth 2012-01-20 19:08:27 -06:00 committed by Anthony Liguori
parent 6fbcef296a
commit ee77dfb26a
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main-loop.c
View File

@ -164,7 +164,7 @@ static int qemu_signal_init(void)
#else /* _WIN32 */ #else /* _WIN32 */
HANDLE qemu_event_handle; HANDLE qemu_event_handle = NULL;
static void dummy_event_handler(void *opaque) static void dummy_event_handler(void *opaque)
{ {
@ -183,6 +183,9 @@ static int qemu_event_init(void)
void qemu_notify_event(void) void qemu_notify_event(void)
{ {
if (!qemu_event_handle) {
return;
}
if (!SetEvent(qemu_event_handle)) { if (!SetEvent(qemu_event_handle)) {
fprintf(stderr, "qemu_notify_event: SetEvent failed: %ld\n", fprintf(stderr, "qemu_notify_event: SetEvent failed: %ld\n",
GetLastError()); GetLastError());