49 lines
1.7 KiB
Diff
49 lines
1.7 KiB
Diff
|
From 7dde1007525ec235e769351be15ca5de34eeda4a Mon Sep 17 00:00:00 2001
|
||
|
|
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||
|
|
Date: Thu, 18 Mar 2021 12:32:26 +0000
|
||
|
|
Subject: [PATCH] appliance: Use <cpu mode="maximum"/> for -cpu max on libvirt.
|
||
|
|
|
||
|
|
Note this requires libvirt >= 7.1.0 which was only released in March 2021.
|
||
|
|
|
||
|
|
With an older libvirt you will see this error:
|
||
|
|
|
||
|
|
Original error from libvirt: unsupported configuration: Invalid mode attribute 'maximum' [code=67 int1=-1]
|
||
|
|
|
||
|
|
In theory we could check if this is supported by looking at the
|
||
|
|
libvirt capabilities and fall back, but this commit does not do that,
|
||
|
|
in the expectation that most people will be using the default backend
|
||
|
|
(direct) and on Fedora/RHEL we will add an explicit minimum version
|
||
|
|
dependency to the package.
|
||
|
|
|
||
|
|
qemu support has been around quite a bit longer (at least since 2017).
|
||
|
|
|
||
|
|
Fixes: commit 30f74f38bd6e42e783ba80895f4d6826abddd417
|
||
|
|
(cherry picked from commit 13ceb6a87b2869909a6a0e3c8caa962b72e4cb0e)
|
||
|
|
---
|
||
|
|
lib/launch-libvirt.c | 9 ++-------
|
||
|
|
1 file changed, 2 insertions(+), 7 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/lib/launch-libvirt.c b/lib/launch-libvirt.c
|
||
|
|
index e3ff1ffe0..db619910f 100644
|
||
|
|
--- a/lib/launch-libvirt.c
|
||
|
|
+++ b/lib/launch-libvirt.c
|
||
|
|
@@ -1170,13 +1170,8 @@ construct_libvirt_xml_cpu (guestfs_h *g,
|
||
|
|
} end_element ();
|
||
|
|
}
|
||
|
|
else if (STREQ (cpu_model, "max")) {
|
||
|
|
- if (params->data->is_kvm)
|
||
|
|
- attribute ("mode", "host-passthrough");
|
||
|
|
- else
|
||
|
|
- attribute ("mode", "host-model");
|
||
|
|
- start_element ("model") {
|
||
|
|
- attribute ("fallback", "allow");
|
||
|
|
- } end_element ();
|
||
|
|
+ /* https://bugzilla.redhat.com/show_bug.cgi?id=1935572#c11 */
|
||
|
|
+ attribute ("mode", "maximum");
|
||
|
|
}
|
||
|
|
else
|
||
|
|
single_element ("model", cpu_model);
|
||
|
|
--
|
||
|
|
2.31.1
|
||
|
|
|