@@ -177,7 +177,7 @@ struct WHPDispatch whp_dispatch;
static whpx_vcpu *get_whpx_vcpu(CPUState *cpu)
{
- return (whpx_vcpu *)cpu->hax_vcpu;
+ return cpu->accel_vcpu;
}
static WHV_X64_SEGMENT_REGISTER whpx_seg_q2h(const SegmentCache *qs, int v86,
@@ -1439,7 +1439,7 @@ int whpx_init_vcpu(CPUState *cpu)
vcpu->interruptable = true;
cpu->vcpu_dirty = true;
- cpu->hax_vcpu = (struct hax_vcpu_state *)vcpu;
+ cpu->accel_vcpu = vcpu;
max_vcpu_index = max(max_vcpu_index, cpu->cpu_index);
qemu_add_vm_change_state_handler(whpx_cpu_update_state, cpu->env_ptr);
@@ -1481,7 +1481,7 @@ void whpx_destroy_vcpu(CPUState *cpu)
whp_dispatch.WHvDeleteVirtualProcessor(whpx->partition, cpu->cpu_index);
whp_dispatch.WHvEmulatorDestroyEmulator(vcpu->emulator);
- g_free(cpu->hax_vcpu);
+ g_free(cpu->accel_vcpu);
return;
}
Instead of naming the HAX accelerator in WHPX, use the 'accel_vcpu' field which is meant for accelerators. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- target/i386/whpx/whpx-all.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)