during my split of cpus.c, code line
"current_cpu = cpu"
was removed by mistake, causing hax to break.
This commit fixes the situation restoring it.
Reported-by: Volker Rümelin <vr_qemu@t-online.de>
Fixes: e92558e4bf
Signed-off-by: Claudio Fontana <cfontana@suse.de>
Message-Id: <20201016080032.13914-1-cfontana@suse.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
86 lines
2.2 KiB
C
86 lines
2.2 KiB
C
/*
|
|
* QEMU HAX support
|
|
*
|
|
* Copyright IBM, Corp. 2008
|
|
* Red Hat, Inc. 2008
|
|
*
|
|
* Authors:
|
|
* Anthony Liguori <aliguori@us.ibm.com>
|
|
* Glauber Costa <gcosta@redhat.com>
|
|
*
|
|
* Copyright (c) 2011 Intel Corporation
|
|
* Written by:
|
|
* Jiang Yunhong<yunhong.jiang@intel.com>
|
|
* Xin Xiaohui<xiaohui.xin@intel.com>
|
|
* Zhang Xiantao<xiantao.zhang@intel.com>
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
|
* See the COPYING file in the top-level directory.
|
|
*
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "qemu/error-report.h"
|
|
#include "qemu/main-loop.h"
|
|
#include "sysemu/runstate.h"
|
|
#include "sysemu/cpus.h"
|
|
#include "qemu/guest-random.h"
|
|
|
|
#include "hax-cpus.h"
|
|
|
|
static void *hax_cpu_thread_fn(void *arg)
|
|
{
|
|
CPUState *cpu = arg;
|
|
int r;
|
|
|
|
rcu_register_thread();
|
|
qemu_mutex_lock_iothread();
|
|
qemu_thread_get_self(cpu->thread);
|
|
|
|
cpu->thread_id = qemu_get_thread_id();
|
|
current_cpu = cpu;
|
|
hax_init_vcpu(cpu);
|
|
cpu_thread_signal_created(cpu);
|
|
qemu_guest_random_seed_thread_part2(cpu->random_seed);
|
|
|
|
do {
|
|
if (cpu_can_run(cpu)) {
|
|
r = hax_smp_cpu_exec(cpu);
|
|
if (r == EXCP_DEBUG) {
|
|
cpu_handle_guest_debug(cpu);
|
|
}
|
|
}
|
|
|
|
qemu_wait_io_event(cpu);
|
|
} while (!cpu->unplug || cpu_can_run(cpu));
|
|
rcu_unregister_thread();
|
|
return NULL;
|
|
}
|
|
|
|
static void hax_start_vcpu_thread(CPUState *cpu)
|
|
{
|
|
char thread_name[VCPU_THREAD_NAME_SIZE];
|
|
|
|
cpu->thread = g_malloc0(sizeof(QemuThread));
|
|
cpu->halt_cond = g_malloc0(sizeof(QemuCond));
|
|
qemu_cond_init(cpu->halt_cond);
|
|
|
|
snprintf(thread_name, VCPU_THREAD_NAME_SIZE, "CPU %d/HAX",
|
|
cpu->cpu_index);
|
|
qemu_thread_create(cpu->thread, thread_name, hax_cpu_thread_fn,
|
|
cpu, QEMU_THREAD_JOINABLE);
|
|
#ifdef _WIN32
|
|
cpu->hThread = qemu_thread_get_handle(cpu->thread);
|
|
#endif
|
|
}
|
|
|
|
const CpusAccel hax_cpus = {
|
|
.create_vcpu_thread = hax_start_vcpu_thread,
|
|
.kick_vcpu_thread = hax_kick_vcpu_thread,
|
|
|
|
.synchronize_post_reset = hax_cpu_synchronize_post_reset,
|
|
.synchronize_post_init = hax_cpu_synchronize_post_init,
|
|
.synchronize_state = hax_cpu_synchronize_state,
|
|
.synchronize_pre_loadvm = hax_cpu_synchronize_pre_loadvm,
|
|
};
|