Skip to contentSkip to conversation

i386: Resolve CPU models to v1 by default

PATCH New Eduardo Habkost 1 participant 1 message Dec 5, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 i386: Resolve CPU models to v1 by default

When using query-cpu-definitions using -machine none, QEMU is resolving all CPU models to their latest versions. The actual CPU model version being used by another machine type (e.g. pc-q35-4.0) might be different.

In theory, this was OK because the correct CPU model version is returned when using the correct -machine argument.

Except that in practice, this breaks libvirt expectations:
libvirt always use -machine none when checking if a CPU model is runnable, because runnability is not expected to be affected when the machine type is changed.

For example, when running on a Haswell host without TSX, Haswell-v4 is runnable, but Haswell-v1 is not. On those hosts, query-cpu-definitions says Haswell is runnable if using -machine none, but Haswell is actually not runnable using any of the pc-* machine types (because they resolve Haswell to Haswell-v1). In other words, we're breaking the "runnability guarantee" we promised to not break for a few releases (see qemu-deprecated.texi).

To address this issue, change the default CPU model version to v1 on all machine types, so we make query-cpu-definitions output when using -machine none match the results when using pc-*. This will change in the future (the plan is to always return the latest CPU model version if using -machine none), but only after giving libvirt the opportunity to adapt.

---
I don't think this should block QEMU 4.2.0 from being tagged. The bug is present since 4.1.0, so we can fix it in 4.1.2 and/or 4.2.1.

---
 qemu-deprecated.texi | 8 ++++++++
 target/i386/cpu.c    | 8 +++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)
qemu-deprecated.texi +8 -0
index 4b4b7425ac..b42d8b3c5f 100644
@@ -374,6 +374,14 @@ guarantees must resolve the CPU model aliases using te
 ``alias-of'' field returned by the ``query-cpu-definitions'' QMP
 command.
 
+While those guarantees are kept, the return value of
+``query-cpu-definitions'' will have existing CPU model aliases
+point to a version that doesn't break runnability guarantees
+(specifically, version 1 of those CPU models).  In future QEMU
+versions, aliases will point to newer CPU model versions
+depending on the machine type, so management software must
+resolve CPU model aliases before starting a virtual machine.
+
 
 @node Recently removed features
 @appendix Recently removed features
target/i386/cpu.c +7 -1
index 69f518a21a..54e7f18a09 100644
@@ -3924,7 +3924,13 @@ static PropValue tcg_default_props[] = {
 };
 
 
-X86CPUVersion default_cpu_version = CPU_VERSION_LATEST;
+/*
+ * We resolve CPU model aliases using -v1 when using "-machine
+ * none", but this is just for compatibility while libvirt isn't
+ * adapted to resolve CPU model versions before creating VMs.
+ * See "Runnability guarantee of CPU models" at * qemu-deprecated.texi.
+ */
+X86CPUVersion default_cpu_version = 1;
 
 void x86_cpu_set_default_version(X86CPUVersion version)
 {
Signature · 1 line
2.23.0