Il ven 11 lug 2025, 04:26 Xiaoyao Li <xiaoyao...@intel.com> ha scritto:
> BTW, the user's value of "pmu" and "invtsc" are still broken for TDX > case. tdx_cpu_instance_init() will always overwrite "pmu" and "invtsc" > even if users explicitly request a different value via "-cpu" option. > > Will we leave it as intentional? or fix it as well? > I need to check the differences with SNP but I am leaning towards treating it as intentional... Maybe warn if there was a user option saying the opposite. I will include these in my soft freeze PR, thanks both for the speedy review!! Paolo > > --- > > target/i386/cpu.c | 8 ++++---- > > 1 file changed, 4 insertions(+), 4 deletions(-) > > > > diff --git a/target/i386/cpu.c b/target/i386/cpu.c > > index 46d59229200..5f95bb97b82 100644 > > --- a/target/i386/cpu.c > > +++ b/target/i386/cpu.c > > @@ -6207,8 +6207,8 @@ static void max_x86_cpu_initfn(Object *obj) > > CPUX86State *env = &cpu->env; > > > > /* > > - * these defaults are used for TCG, other accelerators overwrite > these > > - * values > > + * these defaults are used for TCG, other accelerators have > overwritten > > + * these values > > */ > > if (!env->cpuid_vendor1) { > > object_property_set_str(OBJECT(cpu), "vendor", > CPUID_VENDOR_AMD, > > @@ -9043,8 +9043,6 @@ static void x86_cpu_post_initfn(Object *obj) > > } > > } > > > > - accel_cpu_instance_init(CPU(obj)); > > - > > #ifndef CONFIG_USER_ONLY > > if (current_machine && current_machine->cgs) { > > x86_confidential_guest_cpu_instance_init( > > @@ -9119,6 +9117,8 @@ static void x86_cpu_initfn(Object *obj) > > if (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) > >