accel_cpu_common_realize() first calls accel_cpu->cpu_target_realize then ops->cpu_realize, which is set to hvf_arch_cpu_realize() on HVF.
We want to remove accel_cpu->cpu_target_realize, so have hvf_arch_cpu_realize directly call HVF AccelCPUClass target_realize handler. Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- target/i386/hvf/hvf-cpu.c | 6 +++++- target/i386/hvf/hvf.c | 5 ----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/target/i386/hvf/hvf-cpu.c b/target/i386/hvf/hvf-cpu.c index 316c1b0ba07..35f6bddbc0e 100644 --- a/target/i386/hvf/hvf-cpu.c +++ b/target/i386/hvf/hvf-cpu.c @@ -73,11 +73,15 @@ static void hvf_cpu_instance_init(CPUState *cs) hvf_cpu_xsave_init(); } +bool hvf_arch_cpu_realize(CPUState *cs, Error **errp) +{ + return host_cpu_realizefn(cs, errp); +} + static void hvf_cpu_accel_class_init(ObjectClass *oc, const void *data) { AccelCPUClass *acc = ACCEL_CPU_CLASS(oc); - acc->cpu_target_realize = host_cpu_realizefn; acc->cpu_instance_init = hvf_cpu_instance_init; } diff --git a/target/i386/hvf/hvf.c b/target/i386/hvf/hvf.c index 2d1a943b96c..c2cbacd3360 100644 --- a/target/i386/hvf/hvf.c +++ b/target/i386/hvf/hvf.c @@ -369,11 +369,6 @@ int hvf_arch_init_vcpu(CPUState *cpu) return 0; } -bool hvf_arch_cpu_realize(CPUState *cs, Error **errp) -{ - return true; -} - static void hvf_store_events(CPUState *cpu, uint32_t ins_len, uint64_t idtvec_info) { X86CPU *x86_cpu = X86_CPU(cpu); -- 2.53.0
