From: Andrea Bolognani <abologna@redhat.com>
Date: Fri, 15 Apr 2022 13:09:48 +0000 (+0200)
Subject: qemu: Assume QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT
X-Git-Tag: v8.3.0-rc1~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f1925d718d19f3c1a69dd0ce0cc6ac2c03708bb;p=thirdparty%2Flibvirt.git

qemu: Assume QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT

All QEMU versions we support have this feature.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
---

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index bb45954108..3746f02ff0 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -6542,11 +6542,6 @@ qemuBuildCpuModelArgStr(virQEMUDriver *driver,
          */
         if (ARCH_IS_PPC64(def->os.arch)) {
             virBufferAddLit(buf, "host");
-            if (cpu->model &&
-                !(qemuDomainIsPSeries(def) &&
-                  virQEMUCapsGet(qemuCaps, QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT))) {
-                virBufferAsprintf(buf, ",compat=%s", cpu->model);
-            }
         } else {
             virReportError(VIR_ERR_INTERNAL_ERROR,
                            _("unexpected host-model CPU for %s architecture"),
@@ -7118,8 +7113,7 @@ qemuBuildMachineCommandLine(virCommand *cmd,
 
     if (cpu && cpu->model &&
         cpu->mode == VIR_CPU_MODE_HOST_MODEL &&
-        qemuDomainIsPSeries(def) &&
-        virQEMUCapsGet(qemuCaps, QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT)) {
+        qemuDomainIsPSeries(def)) {
         virBufferAsprintf(&buf, ",max-cpu-compat=%s", cpu->model);
     }