OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

accel: Move HAX hThread to accelerator context 

hThread variable is only used by the HAX accelerator,
so move it to the accelerator specific context.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230624174121.11508-9-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2023-03-29 19:13:09 +02:00
parent f861b3f390
commit 642ce52d8e
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/hw/core/cpu.h
View File

@ -338,7 +338,6 @@ struct CPUState {
struct QemuThread *thread;
#ifdef _WIN32
HANDLE hThread;
QemuSemaphore sem;
#endif
int thread_id;

2
target/i386/hax/hax-accel-ops.c
View File

@ -73,7 +73,7 @@ static void hax_start_vcpu_thread(CPUState *cpu)
cpu, QEMU_THREAD_JOINABLE);
assert(cpu->accel);
#ifdef _WIN32
cpu->hThread = qemu_thread_get_handle(cpu->thread);
cpu->accel->hThread = qemu_thread_get_handle(cpu->thread);
#endif
}

2
target/i386/hax/hax-all.c
View File

@ -206,7 +206,7 @@ int hax_vcpu_destroy(CPUState *cpu)
hax_close_fd(vcpu->fd);
hax_global.vm->vcpus[vcpu->vcpu_id] = NULL;
#ifdef _WIN32
CloseHandle(cpu->hThread);
CloseHandle(vcpu->hThread);
#endif
g_free(vcpu);
cpu->accel = NULL;

3
target/i386/hax/hax-i386.h
View File

@ -27,6 +27,9 @@ typedef HANDLE hax_fd;
extern struct hax_state hax_global;
struct AccelCPUState {
#ifdef _WIN32
HANDLE hThread;
#endif
hax_fd fd;
int vcpu_id;
struct hax_tunnel *tunnel;

2
target/i386/hax/hax-windows.c
View File

@ -476,7 +476,7 @@ void hax_kick_vcpu_thread(CPUState *cpu)
*/
cpu->exit_request = 1;
if (!qemu_cpu_is_self(cpu)) {
if (!QueueUserAPC(dummy_apc_func, cpu->hThread, 0)) {
if (!QueueUserAPC(dummy_apc_func, cpu->accel->hThread, 0)) {
fprintf(stderr, "%s: QueueUserAPC failed with error %lu\n",
__func__, GetLastError());
exit(1);