Add new version of Cascadelake-Server CPU model, setting
stepping=5 and enabling the IA32_ARCH_CAPABILITIES MSR.
The new feature will introduce a new host software requirement,
breaking our CPU model runnability promises. This means we can't
enable the new CPU model version by default in QEMU 4.1, because
management software isn't ready yet to resolve CPU model aliases.
This is why the feature is being enabled in a
Cascadelake-Server-4.1.1 CPU model instead of
Cascadelake-Server-4.1.
Includes a test case to ensure the right combinations of
machine-type + CPU model + command-line feature flags will work
as expected.
Signed-off-by: Eduardo Habkost <address@hidden>
---
Cc: "Hu, Robert" <address@hidden>
Cc: Tao Xu <address@hidden>
Cc: address@hidden,
Cc: "Lai, Paul C" <address@hidden>
---
target/i386/cpu.c | 15 +++++
tests/acceptance/x86_cpu_model_versions.py | 71 ++++++++++++++++++++++
2 files changed, 86 insertions(+)
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 121f568954..8edae04161 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -2607,6 +2607,21 @@ static X86CPUDefinition builtin_x86_defs[] = {
+ # versioned CPU model overrides machine-type:
+ vm = self.get_vm()
+ vm.add_args('-S')
+ vm.set_machine('pc-i440fx-4.0')
+ vm.add_args('-cpu',
'Cascadelake-Server-4.1,x-force-features=on,check=off,enforce=off')
+ vm.launch()
+ self.assertFalse(get_cpu_prop(vm, 'arch-capabilities'),
+ 'pc-i440fx-4.1 + Cascadelake-Server-4.1 should not
have arch-capabilities')
+
+ vm = self.get_vm()
+ vm.add_args('-S')
+ vm.set_machine('pc-i440fx-4.0')
+ vm.add_args('-cpu',
'Cascadelake-Server-4.1.1,x-force-features=on,check=off,enforce=off')
+ vm.launch()
+ self.assertTrue(get_cpu_prop(vm, 'arch-capabilities'),
+ 'pc-i440fx-4.1 + Cascadelake-Server-4.1 should have
arch-capabilities')