[9/9] w32: Replace Windows specific data types in common header files

Message ID	1393174935-11750-10-git-send-email-sw@weilnetz.de
State	Superseded
Headers	show Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> From: Stefan Weil <sw@weilnetz.de> To: qemu-devel@nongnu.org Date: Sun, 23 Feb 2014 18:02:15 +0100 Message-Id: <1393174935-11750-10-git-send-email-sw@weilnetz.de> In-Reply-To: <1393174935-11750-1-git-send-email-sw@weilnetz.de> References: <1393174935-11750-1-git-send-email-sw@weilnetz.de> Error: Malformed IPv6 address (bad octet value). Cc: Kevin Wolf <kwolf@redhat.com>, Peter Maydell <peter.maydell@linaro.org>, Stefan Hajnoczi <stefanha@redhat.com>, Anthony Liguori <aliguori@amazon.com>, Stefan Weil <sw@weilnetz.de> Subject: [Qemu-devel] [PATCH 9/9] w32: Replace Windows specific data types in common header files Precedence: list Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org

diff --git a/block/raw-aio.h b/block/raw-aio.h index 7ad0a8a..fd3f3bf 100644 --- a/block/raw-aio.h +++ b/block/raw-aio.h @@ -42,9 +42,9 @@ BlockDriverAIOCB *laio_submit(BlockDriverState *bs, void *aio_ctx, int fd, #ifdef _WIN32 typedef struct QEMUWin32AIOState QEMUWin32AIOState; QEMUWin32AIOState *win32_aio_init(void); -int win32_aio_attach(QEMUWin32AIOState *aio, HANDLE hfile); +int win32_aio_attach(QEMUWin32AIOState *aio, void *hfile); BlockDriverAIOCB *win32_aio_submit(BlockDriverState *bs, - QEMUWin32AIOState *aio, HANDLE hfile, + QEMUWin32AIOState *aio, void *hfile, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, BlockDriverCompletionFunc *cb, void *opaque, int type); #endif diff --git a/cpus.c b/cpus.c index 945d85b..4e91e08 100644 --- a/cpus.c +++ b/cpus.c @@ -39,7 +39,9 @@ #include "qemu/bitmap.h" #include "qemu/seqlock.h" -#ifndef _WIN32 +#ifdef _WIN32 +#include "sysemu/os-winapi.h" /* SuspendThread, ... */ +#else #include "qemu/compatfd.h" #endif diff --git a/include/qemu/event_notifier.h b/include/qemu/event_notifier.h index 1b75f29..222ef8c 100644 --- a/include/qemu/event_notifier.h +++ b/include/qemu/event_notifier.h @@ -15,13 +15,9 @@ #include "qemu-common.h" -#ifdef _WIN32 -#include "sysemu/os-winapi.h" -#endif - struct EventNotifier { #ifdef _WIN32 - HANDLE event; + void *event; #else int rfd; int wfd; @@ -40,7 +36,7 @@ int event_notifier_set_handler(EventNotifier *, EventNotifierHandler *); void event_notifier_init_fd(EventNotifier *, int fd); int event_notifier_get_fd(EventNotifier *); #else -HANDLE event_notifier_get_handle(EventNotifier *); +void *event_notifier_get_handle(EventNotifier *); #endif #endif diff --git a/include/qemu/main-loop.h b/include/qemu/main-loop.h index 6f0200a..68d2798 100644 --- a/include/qemu/main-loop.h +++ b/include/qemu/main-loop.h @@ -152,7 +152,7 @@ typedef void WaitObjectFunc(void *opaque); * @func: A function to be called when @handle is in a signaled state. * @opaque: A pointer-size value that is passed to @func. */ -int qemu_add_wait_object(HANDLE handle, WaitObjectFunc *func, void *opaque); +int qemu_add_wait_object(void *handle, WaitObjectFunc *func, void *opaque); /** * qemu_del_wait_object: Unregister a callback for a Windows handle @@ -163,7 +163,7 @@ int qemu_add_wait_object(HANDLE handle, WaitObjectFunc *func, void *opaque); * @func: The function that was passed to qemu_add_wait_object. * @opaque: A pointer-size value that was passed to qemu_add_wait_object. */ -void qemu_del_wait_object(HANDLE handle, WaitObjectFunc *func, void *opaque); +void qemu_del_wait_object(void *handle, WaitObjectFunc *func, void *opaque); #endif /* async I/O support */ diff --git a/include/qemu/thread-win32.h b/include/qemu/thread-win32.h index 127a7ba..d2ff862 100644 --- a/include/qemu/thread-win32.h +++ b/include/qemu/thread-win32.h @@ -1,24 +1,35 @@ #ifndef __QEMU_THREAD_WIN32_H #define __QEMU_THREAD_WIN32_H 1 -#include "sysemu/os-winapi.h" + +/* QemuCriticalSection is a substitute for CRITICAL_SECTION and + * introduced here to avoid dependencies on windows.h. */ + +typedef struct { + void *DebugInfo; + long LockCount; + long RecursionCount; + void *OwningThread; + void *LockSemaphore; + unsigned long *SpinCount; +} QemuCriticalSection; struct QemuMutex { - CRITICAL_SECTION lock; - LONG owner; + QemuCriticalSection lock; + long owner; }; struct QemuCond { - LONG waiters, target; - HANDLE sema; - HANDLE continue_event; + long waiters, target; + void *sema; + void *continue_event; }; struct QemuSemaphore { - HANDLE sema; + void *sema; }; struct QemuEvent { - HANDLE event; + void *event; }; typedef struct QemuThreadData QemuThreadData; @@ -28,6 +39,6 @@ struct QemuThread { }; /* Only valid for joinable threads. */ -HANDLE qemu_thread_get_handle(QemuThread *thread); +void *qemu_thread_get_handle(QemuThread *thread); #endif diff --git a/include/qom/cpu.h b/include/qom/cpu.h index 367eda1..6ea48c4 100644 --- a/include/qom/cpu.h +++ b/include/qom/cpu.h @@ -170,7 +170,7 @@ struct CPUState { struct QemuThread *thread; #ifdef _WIN32 - HANDLE hThread; + void *hThread; #endif int thread_id; uint32_t host_tid; diff --git a/ui/vnc-enc-tight.c b/ui/vnc-enc-tight.c index 92220e3..2e6fb88 100644 --- a/ui/vnc-enc-tight.c +++ b/ui/vnc-enc-tight.c @@ -27,11 +27,6 @@ */ #include "config-host.h" - -/* This needs to be before jpeglib.h line because of conflict with - INT32 definitions between jmorecfg.h (included by jpeglib.h) and - Win32 basetsd.h (included by windows.h). */ -#include "sysemu/os-winapi.h" /* TODO: workaround, remove */ #include "qemu-common.h" #ifdef CONFIG_VNC_PNG diff --git a/util/event_notifier-win32.c b/util/event_notifier-win32.c index 6dbb530..bf39268 100644 --- a/util/event_notifier-win32.c +++ b/util/event_notifier-win32.c @@ -13,6 +13,7 @@ #include "qemu-common.h" #include "qemu/event_notifier.h" #include "qemu/main-loop.h" +#include "sysemu/os-winapi.h" /* CreateEvent, ... */ int event_notifier_init(EventNotifier *e, int active) { diff --git a/util/qemu-thread-win32.c b/util/qemu-thread-win32.c index 27a5217..6d1f777 100644 --- a/util/qemu-thread-win32.c +++ b/util/qemu-thread-win32.c @@ -10,11 +10,10 @@ * See the COPYING file in the top-level directory. * */ + +#include "sysemu/os-winapi.h" /* LocalFree, ... */ #include "qemu-common.h" #include "qemu/thread.h" -#include <process.h> -#include <assert.h> -#include <limits.h> static void error_exit(int err, const char *msg) { @@ -30,18 +29,20 @@ static void error_exit(int err, const char *msg) void qemu_mutex_init(QemuMutex *mutex) { mutex->owner = 0; - InitializeCriticalSection(&mutex->lock); + /* mutex->lock uses a data type which must fit CRITICAL_SECTION. */ + g_assert(sizeof(mutex->lock) == sizeof(CRITICAL_SECTION)); + InitializeCriticalSection((CRITICAL_SECTION *)&mutex->lock); } void qemu_mutex_destroy(QemuMutex *mutex) { assert(mutex->owner == 0); - DeleteCriticalSection(&mutex->lock); + DeleteCriticalSection((CRITICAL_SECTION *)&mutex->lock); } void qemu_mutex_lock(QemuMutex *mutex) { - EnterCriticalSection(&mutex->lock); + EnterCriticalSection((CRITICAL_SECTION *)&mutex->lock); /* Win32 CRITICAL_SECTIONs are recursive. Assert that we're not * using them as such. @@ -54,7 +55,7 @@ int qemu_mutex_trylock(QemuMutex *mutex) { int owned; - owned = TryEnterCriticalSection(&mutex->lock); + owned = TryEnterCriticalSection((CRITICAL_SECTION *)&mutex->lock); if (owned) { assert(mutex->owner == 0); mutex->owner = GetCurrentThreadId(); @@ -66,7 +67,7 @@ void qemu_mutex_unlock(QemuMutex *mutex) { assert(mutex->owner == GetCurrentThreadId()); mutex->owner = 0; - LeaveCriticalSection(&mutex->lock); + LeaveCriticalSection((CRITICAL_SECTION *)&mutex->lock); } void qemu_cond_init(QemuCond *cond)

[9/9] w32: Replace Windows specific data types in common header files

Commit Message

Comments

Patch