Commit ee77dfb2 authored Jan 20, 2012 by Michael Roth Committed by Anthony Liguori Feb 01, 2012

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 <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>

parent 6fbcef29

main-loop.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -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());