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

accel/whpx: Use accel-specific per-vcpu @dirty field 

WHPX has a specific use of the CPUState::vcpu_dirty field
(CPUState::vcpu_dirty is not used by common code).
To make this field accel-specific, add and use a new
@dirty variable in the AccelCPUState structure.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20240424174506.326-2-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2024-04-24 18:16:34 +02:00
parent 2379866c3b
commit 9ad49538c7
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
target/i386/whpx/whpx-all.c
View File

@ -237,6 +237,7 @@ struct AccelCPUState {
uint64_t tpr; uint64_t tpr;
uint64_t apic_base; uint64_t apic_base;
bool interruption_pending; bool interruption_pending;
bool dirty;
/* Must be the last field as it may have a tail */ /* Must be the last field as it may have a tail */
WHV_RUN_VP_EXIT_CONTEXT exit_ctx; WHV_RUN_VP_EXIT_CONTEXT exit_ctx;
@ -839,7 +840,7 @@ static HRESULT CALLBACK whpx_emu_setreg_callback(
* The emulator just successfully wrote the register state. We clear the * The emulator just successfully wrote the register state. We clear the
* dirty state so we avoid the double write on resume of the VP. * dirty state so we avoid the double write on resume of the VP.
*/ */
cpu->vcpu_dirty = false; cpu->accel->dirty = false;
return hr; return hr;
} }
@ -1394,7 +1395,7 @@ static int whpx_last_vcpu_stopping(CPUState *cpu)
/* Returns the address of the next instruction that is about to be executed. */ /* Returns the address of the next instruction that is about to be executed. */
static vaddr whpx_vcpu_get_pc(CPUState *cpu, bool exit_context_valid) static vaddr whpx_vcpu_get_pc(CPUState *cpu, bool exit_context_valid)
{ {
if (cpu->vcpu_dirty) { if (cpu->accel->dirty) {
/* The CPU registers have been modified by other parts of QEMU. */ /* The CPU registers have been modified by other parts of QEMU. */
return cpu_env(cpu)->eip; return cpu_env(cpu)->eip;
} else if (exit_context_valid) { } else if (exit_context_valid) {
@ -1713,9 +1714,9 @@ static int whpx_vcpu_run(CPUState *cpu)
} }
do { do {
if (cpu->vcpu_dirty) { if (cpu->accel->dirty) {
whpx_set_registers(cpu, WHPX_SET_RUNTIME_STATE); whpx_set_registers(cpu, WHPX_SET_RUNTIME_STATE);
cpu->vcpu_dirty = false; cpu->accel->dirty = false;
} }
if (exclusive_step_mode == WHPX_STEP_NONE) { if (exclusive_step_mode == WHPX_STEP_NONE) {
@ -2063,9 +2064,9 @@ static int whpx_vcpu_run(CPUState *cpu)
static void do_whpx_cpu_synchronize_state(CPUState *cpu, run_on_cpu_data arg) static void do_whpx_cpu_synchronize_state(CPUState *cpu, run_on_cpu_data arg)
{ {
if (!cpu->vcpu_dirty) { if (!cpu->accel->dirty) {
whpx_get_registers(cpu); whpx_get_registers(cpu);
cpu->vcpu_dirty = true; cpu->accel->dirty = true;
} }
} }
@ -2073,20 +2074,20 @@ static void do_whpx_cpu_synchronize_post_reset(CPUState *cpu,
run_on_cpu_data arg) run_on_cpu_data arg)
{ {
whpx_set_registers(cpu, WHPX_SET_RESET_STATE); whpx_set_registers(cpu, WHPX_SET_RESET_STATE);
cpu->vcpu_dirty = false; cpu->accel->dirty = false;
} }
static void do_whpx_cpu_synchronize_post_init(CPUState *cpu, static void do_whpx_cpu_synchronize_post_init(CPUState *cpu,
run_on_cpu_data arg) run_on_cpu_data arg)
{ {
whpx_set_registers(cpu, WHPX_SET_FULL_STATE); whpx_set_registers(cpu, WHPX_SET_FULL_STATE);
cpu->vcpu_dirty = false; cpu->accel->dirty = false;
} }
static void do_whpx_cpu_synchronize_pre_loadvm(CPUState *cpu, static void do_whpx_cpu_synchronize_pre_loadvm(CPUState *cpu,
run_on_cpu_data arg) run_on_cpu_data arg)
{ {
cpu->vcpu_dirty = true; cpu->accel->dirty = true;
} }
/* /*
@ -2095,7 +2096,7 @@ static void do_whpx_cpu_synchronize_pre_loadvm(CPUState *cpu,
void whpx_cpu_synchronize_state(CPUState *cpu) void whpx_cpu_synchronize_state(CPUState *cpu)
{ {
if (!cpu->vcpu_dirty) { if (!cpu->accel->dirty) {
run_on_cpu(cpu, do_whpx_cpu_synchronize_state, RUN_ON_CPU_NULL); run_on_cpu(cpu, do_whpx_cpu_synchronize_state, RUN_ON_CPU_NULL);
} }
} }
@ -2235,7 +2236,7 @@ int whpx_init_vcpu(CPUState *cpu)
} }
vcpu->interruptable = true; vcpu->interruptable = true;
cpu->vcpu_dirty = true; cpu->accel->dirty = true;
cpu->accel = vcpu; cpu->accel = vcpu;
max_vcpu_index = max(max_vcpu_index, cpu->cpu_index); max_vcpu_index = max(max_vcpu_index, cpu->cpu_index);
qemu_add_vm_change_state_handler(whpx_cpu_update_state, env); qemu_add_vm_change_state_handler(whpx_cpu_update_state, env);