[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PATCH] main-loop: Fix SetEvent() on uninitialized handle
From: |
Michael Roth |
Subject: |
[Qemu-trivial] [PATCH] main-loop: Fix SetEvent() on uninitialized handle on win32 |
Date: |
Fri, 20 Jan 2012 19:08:27 -0600 |
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.
Signed-off-by: Michael Roth <address@hidden>
---
main-loop.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/main-loop.c b/main-loop.c
index 692381c..62d95b9 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());
--
1.7.4.1
- [Qemu-trivial] [PATCH] main-loop: Fix SetEvent() on uninitialized handle on win32,
Michael Roth <=