Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-09-27 09:01:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

target/i386: move accel_cpu_instance_init to .instance_init

Browse Source 
With the reordering of instance_post_init callbacks that is new in 10.1
accel_cpu_instance_init must execute in .instance_init as is already
the case for RISC-V.  Otherwise, for example, setting the vendor
property is broken when using KVM or Hypervisor.framework, because
KVM sets it *after* the user's value is set by DeviceState's
intance_post_init callback.

Reported-by: Like Xu <like.xu.linux@gmail.com>
Reported-by: Dongli Zhang <dongli.zhang@oracle.com>
Reviewed-by: Xiaoyao Li <xiaoyao.li@intel.com>
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2025-07-05 14:30:52 +02:00
parent 810fcc41fc
commit 5f158abef4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
target/i386/cpu.c
View File

@ -6202,8 +6202,8 @@ static void max_x86_cpu_initfn(Object *obj)
CPUX86State *env = &cpu->env; CPUX86State *env = &cpu->env;
/* /*
* these defaults are used for TCG, other accelerators overwrite these * these defaults are used for TCG, other accelerators have overwritten
* values * these values
*/ */
if (!env->cpuid_vendor1) { if (!env->cpuid_vendor1) {
object_property_set_str(OBJECT(cpu), "vendor", CPUID_VENDOR_AMD, object_property_set_str(OBJECT(cpu), "vendor", CPUID_VENDOR_AMD,
@ -9038,8 +9038,6 @@ static void x86_cpu_post_initfn(Object *obj)
} }
} }
accel_cpu_instance_init(CPU(obj));
#ifndef CONFIG_USER_ONLY #ifndef CONFIG_USER_ONLY
if (current_machine && current_machine->cgs) { if (current_machine && current_machine->cgs) {
x86_confidential_guest_cpu_instance_init( x86_confidential_guest_cpu_instance_init(
@ -9114,6 +9112,8 @@ static void x86_cpu_initfn(Object *obj)
if (xcc->model) { if (xcc->model) {
x86_cpu_load_model(cpu, xcc->model); x86_cpu_load_model(cpu, xcc->model);
} }
accel_cpu_instance_init(CPU(obj));
} }
static int64_t x86_cpu_get_arch_id(CPUState *cs) static int64_t x86_cpu_get_arch_id(CPUState *cs)