fridtjof/qemu-cr16
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

i386/cpu: Add x-vendor-cpuid-only-v2 option for compatibility

Browse source 
Add a compat property "x-vendor-cpuid-only-v2" (for PC machine v10.0
and older) to keep the original behavior. This property will be used
to adjust vendor specific CPUID fields.

Make x-vendor-cpuid-only-v2 depend on x-vendor-cpuid-only. Although
x-vendor-cpuid-only and v2 should be initernal only, QEMU doesn't
support "internal" property. To avoid any other unexpected issues, check
the dependency.

Tested-by: Yi Lai <yi1.lai@intel.com>
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
Link: https://lore.kernel.org/r/20250711102143.1622339-8-zhao1.liu@intel.com
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Zhao Liu 2025-07-11 18:21:32 +08:00 • committed by Paolo Bonzini
parent c416411c28
commit 216d9bb6d7
3 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
hw/i386/pc.c
View file

@ -83,6 +83,7 @@
GlobalProperty pc_compat_10_0[] = {
{ TYPE_X86_CPU, "x-consistent-cache", "false" },
{ TYPE_X86_CPU, "x-vendor-cpuid-only-v2", "false" },
};
const size_t pc_compat_10_0_len = G_N_ELEMENTS(pc_compat_10_0);

10
target/i386/cpu.c
View file

@ -8749,6 +8749,16 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp)
tcg_cflags_set(cs, CF_PCREL);
#endif
/*
* x-vendor-cpuid-only and v2 should be initernal only. But
* QEMU doesn't support "internal" property.
*/
if (!cpu->vendor_cpuid_only && cpu->vendor_cpuid_only_v2) {
error_setg(errp, "x-vendor-cpuid-only-v2 property "
"depends on x-vendor-cpuid-only");
return;
}
if (cpu->apic_id == UNASSIGNED_APIC_ID) {
error_setg(errp, "apic-id property was not initialized properly");
return;

11
target/i386/cpu.h
View file

@ -2282,9 +2282,18 @@ struct ArchCPU {
/* Enable auto level-increase for all CPUID leaves */
bool full_cpuid_auto_level;
/* Only advertise CPUID leaves defined by the vendor */
/*
* Compatibility bits for old machine types (PC machine v6.0 and older).
* Only advertise CPUID leaves defined by the vendor.
*/
bool vendor_cpuid_only;
/*
* Compatibility bits for old machine types (PC machine v10.0 and older).
* Only advertise CPUID leaves defined by the vendor.
*/
bool vendor_cpuid_only_v2;
/* Only advertise TOPOEXT features that AMD defines */
bool amd_topoext_features_only;