Blob Blame History Raw
From 7af98c099c181f0b378a8390fb72f424d4bc7a4a Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 25 Mar 2021 19:44:34 +0000
Subject: [PATCH] Revert "appliance: Use <cpu mode="maximum"/> for -cpu max on
 libvirt."

This reverts commit 13ceb6a87b2869909a6a0e3c8caa962b72e4cb0e.
---
 lib/launch-libvirt.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/launch-libvirt.c b/lib/launch-libvirt.c
index 194530c49..2d995bee0 100644
--- a/lib/launch-libvirt.c
+++ b/lib/launch-libvirt.c
@@ -1183,8 +1183,13 @@ construct_libvirt_xml_cpu (guestfs_h *g,
         } end_element ();
       }
       else if (STREQ (cpu_model, "max")) {
-        /* https://bugzilla.redhat.com/show_bug.cgi?id=1935572#c11 */
-        attribute ("mode", "maximum");
+        if (params->data->is_kvm)
+          attribute ("mode", "host-passthrough");
+        else
+          attribute ("mode", "host-model");
+        start_element ("model") {
+          attribute ("fallback", "allow");
+        } end_element ();
       }
       else
         single_element ("model", cpu_model);
-- 
2.29.0.rc2