From ee77dfb26a5c7972bd7100e910c7427bcb1c8cae Mon Sep 17 00:00:00 2001 From: Michael Roth Date: Fri, 20 Jan 2012 19:08:27 -0600 Subject: main-loop: Fix SetEvent() on uninitialized handle on win32 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 Signed-off-by: Michael Roth Signed-off-by: Michael Roth Signed-off-by: Anthony Liguori --- main-loop.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/main-loop.c b/main-loop.c index 692381cb19..62d95b9637 100644 --- a/main-loop.c +++ b/main-loop.c @@ -164,7 +164,7 @@ static int qemu_signal_init(void) #else /* _WIN32 */ -HANDLE qemu_event_handle; +HANDLE qemu_event_handle = NULL; static void dummy_event_handler(void *opaque) { @@ -183,6 +183,9 @@ static int qemu_event_init(void) void qemu_notify_event(void) { + if (!qemu_event_handle) { + return; + } if (!SetEvent(qemu_event_handle)) { fprintf(stderr, "qemu_notify_event: SetEvent failed: %ld\n", GetLastError()); -- cgit v1.2.3