ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'sweil/w32' into staging 

* sweil/w32:
  w32: Initialise critical section before starting thread (fix #922131)
  w32: Build windows and console executables
This commit is contained in:
Anthony Liguori 2012-02-08 07:23:23 -06:00
parent cf4dc461a4 edc1de9713
commit a283b1b8eb
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile.target
View File

@ -29,10 +29,17 @@ ifdef CONFIG_USER_ONLY
QEMU_PROG=qemu-$(TARGET_ARCH2) QEMU_PROG=qemu-$(TARGET_ARCH2)
else else
# system emulator name # system emulator name
ifneq (,$(findstring -mwindows,$(LIBS)))
# Terminate program name with a 'w' because the linker builds a windows executable.
QEMU_PROGW=qemu-system-$(TARGET_ARCH2)w$(EXESUF)
endif # windows executable
QEMU_PROG=qemu-system-$(TARGET_ARCH2)$(EXESUF) QEMU_PROG=qemu-system-$(TARGET_ARCH2)$(EXESUF)
endif endif
PROGS=$(QEMU_PROG) PROGS=$(QEMU_PROG)
ifdef QEMU_PROGW
PROGS+=$(QEMU_PROGW)
endif
STPFILES= STPFILES=
ifndef CONFIG_HAIKU ifndef CONFIG_HAIKU
@ -407,9 +414,16 @@ endif # CONFIG_LINUX_USER
obj-$(CONFIG_GDBSTUB_XML) += gdbstub-xml.o obj-$(CONFIG_GDBSTUB_XML) += gdbstub-xml.o
ifdef QEMU_PROGW
# The linker builds a windows executable. Make also a console executable.
$(QEMU_PROGW): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y)
$(call LINK,$^)
$(QEMU_PROG): $(QEMU_PROGW)
$(call quiet-command,$(OBJCOPY) --subsystem console $(QEMU_PROGW) $(QEMU_PROG)," GEN $(TARGET_DIR)$(QEMU_PROG)")
else
$(QEMU_PROG): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y) $(QEMU_PROG): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y)
$(call LINK,$^) $(call LINK,$^)
endif
gdbstub-xml.c: $(TARGET_XML_FILES) $(SRC_PATH)/scripts/feature_to_c.sh gdbstub-xml.c: $(TARGET_XML_FILES) $(SRC_PATH)/scripts/feature_to_c.sh
$(call quiet-command,rm -f $@ && $(SHELL) $(SRC_PATH)/scripts/feature_to_c.sh $@ $(TARGET_XML_FILES)," GEN $(TARGET_DIR)$@") $(call quiet-command,rm -f $@ && $(SHELL) $(SRC_PATH)/scripts/feature_to_c.sh $@ $(TARGET_XML_FILES)," GEN $(TARGET_DIR)$@")

9
qemu-thread-win32.c
View File

@ -215,8 +215,6 @@ static unsigned __stdcall win32_start_routine(void *arg)
if (data->mode == QEMU_THREAD_DETACHED) { if (data->mode == QEMU_THREAD_DETACHED) {
g_free(data); g_free(data);
data = NULL; data = NULL;
} else {
InitializeCriticalSection(&data->cs);
} }
TlsSetValue(qemu_thread_tls_index, data); TlsSetValue(qemu_thread_tls_index, data);
qemu_thread_exit(start_routine(thread_arg)); qemu_thread_exit(start_routine(thread_arg));
@ -227,6 +225,7 @@ void qemu_thread_exit(void *arg)
{ {
QemuThreadData *data = TlsGetValue(qemu_thread_tls_index); QemuThreadData *data = TlsGetValue(qemu_thread_tls_index);
if (data) { if (data) {
assert(data->mode != QEMU_THREAD_DETACHED);
data->ret = arg; data->ret = arg;
EnterCriticalSection(&data->cs); EnterCriticalSection(&data->cs);
data->exited = true; data->exited = true;
@ -258,6 +257,7 @@ void *qemu_thread_join(QemuThread *thread)
CloseHandle(handle); CloseHandle(handle);
} }
ret = data->ret; ret = data->ret;
assert(data->mode != QEMU_THREAD_DETACHED);
DeleteCriticalSection(&data->cs); DeleteCriticalSection(&data->cs);
g_free(data); g_free(data);
return ret; return ret;
@ -288,6 +288,10 @@ void qemu_thread_create(QemuThread *thread,
data->mode = mode; data->mode = mode;
data->exited = false; data->exited = false;
if (data->mode != QEMU_THREAD_DETACHED) {
InitializeCriticalSection(&data->cs);
}
hThread = (HANDLE) _beginthreadex(NULL, 0, win32_start_routine, hThread = (HANDLE) _beginthreadex(NULL, 0, win32_start_routine,
data, 0, &thread->tid); data, 0, &thread->tid);
if (!hThread) { if (!hThread) {
@ -314,6 +318,7 @@ HANDLE qemu_thread_get_handle(QemuThread *thread)
return NULL; return NULL;
} }
assert(data->mode != QEMU_THREAD_DETACHED);
EnterCriticalSection(&data->cs); EnterCriticalSection(&data->cs);
if (!data->exited) { if (!data->exited) {
handle = OpenThread(SYNCHRONIZE | THREAD_SUSPEND_RESUME, FALSE, handle = OpenThread(SYNCHRONIZE | THREAD_SUSPEND_RESUME, FALSE,