diff --git a/SOURCES/0020-appliance-Use-cpu-max.patch b/SOURCES/0020-appliance-Use-cpu-max.patch new file mode 100644 index 0000000..cf34b45 --- /dev/null +++ b/SOURCES/0020-appliance-Use-cpu-max.patch @@ -0,0 +1,86 @@ +From fbb053fc71c0c072acb3fbf6e5fbbfc3b0667fd2 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Thu, 28 Jan 2021 12:20:49 +0000 +Subject: [PATCH] appliance: Use -cpu max. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +QEMU has a newish feature (from about 2017 / qemu 2.9) called -cpu max +which is supposed to select the best CPU, ideal for libguestfs. + +After this change, on x86-64: + + KVM TCG + +Direct -cpu max -cpu max +(non-libvirt) + +Libvirt + + + +Thanks: Daniel Berrangé +(cherry picked from commit 30f74f38bd6e42e783ba80895f4d6826abddd417) +--- + lib/appliance-cpu.c | 16 ++++++++-------- + lib/launch-libvirt.c | 9 +++++++++ + 2 files changed, 17 insertions(+), 8 deletions(-) + +diff --git a/lib/appliance-cpu.c b/lib/appliance-cpu.c +index 5ef9f5c72..54ac6e2e3 100644 +--- a/lib/appliance-cpu.c ++++ b/lib/appliance-cpu.c +@@ -38,6 +38,11 @@ + * + * The literal string C<"host"> means use C<-cpu host>. + * ++ * =item C<"max"> ++ * ++ * The literal string C<"max"> means use C<-cpu max> (the best ++ * possible). This requires awkward translation for libvirt. ++ * + * =item some string + * + * Some string such as C<"cortex-a57"> means use C<-cpu cortex-a57>. +@@ -80,14 +85,9 @@ guestfs_int_get_cpu_model (int kvm) + /* See discussion in https://bugzilla.redhat.com/show_bug.cgi?id=1605071 */ + return NULL; + #else +- /* On most architectures, it is faster to pass the CPU host model to +- * the appliance, allowing maximum speed for things like checksums +- * and encryption. Only do this with KVM. It is broken in subtle +- * ways on TCG, and fairly pointless when you're emulating anyway. ++ /* On most architectures we can use "max" to get the best possible CPU. ++ * For recent qemu this should work even on TCG. + */ +- if (kvm) +- return "host"; +- else +- return NULL; ++ return "max"; + #endif + } +diff --git a/lib/launch-libvirt.c b/lib/launch-libvirt.c +index f6bb39d99..e3ff1ffe0 100644 +--- a/lib/launch-libvirt.c ++++ b/lib/launch-libvirt.c +@@ -1169,6 +1169,15 @@ construct_libvirt_xml_cpu (guestfs_h *g, + attribute ("fallback", "allow"); + } 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 (); ++ } + else + single_element ("model", cpu_model); + } end_element (); +-- +2.31.1 + diff --git a/SOURCES/0021-appliance-Use-cpu-mode-maximum-for-cpu-max-on-libvir.patch b/SOURCES/0021-appliance-Use-cpu-mode-maximum-for-cpu-max-on-libvir.patch new file mode 100644 index 0000000..5309621 --- /dev/null +++ b/SOURCES/0021-appliance-Use-cpu-mode-maximum-for-cpu-max-on-libvir.patch @@ -0,0 +1,48 @@ +From 7dde1007525ec235e769351be15ca5de34eeda4a Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Thu, 18 Mar 2021 12:32:26 +0000 +Subject: [PATCH] appliance: Use 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 + diff --git a/SOURCES/copy-patches.sh b/SOURCES/copy-patches.sh index 0fc8036..de6628e 100755 --- a/SOURCES/copy-patches.sh +++ b/SOURCES/copy-patches.sh @@ -6,7 +6,7 @@ set -e # directory. Use it like this: # ./copy-patches.sh -rhel_version=8.6.0 +rhel_version=8.7.0 # Check we're in the right directory. if [ ! -f libguestfs.spec ]; then diff --git a/SPECS/libguestfs.spec b/SPECS/libguestfs.spec index 6cf69fb..6743f22 100644 --- a/SPECS/libguestfs.spec +++ b/SPECS/libguestfs.spec @@ -32,7 +32,7 @@ Summary: Access and modify virtual machine disk images Name: libguestfs Epoch: 1 Version: 1.44.0 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPLv2+ ExclusiveArch: x86_64 %{power64} aarch64 s390x @@ -45,7 +45,7 @@ Source1: http://libguestfs.org/download/%{source_directory}/%{name}-%{vers %endif # RHEL 8 git repository is: -# https://github.com/libguestfs/libguestfs/tree/rhel-8.6.0 +# https://github.com/libguestfs/libguestfs/tree/rhel-8.7.0 # Use 'copy-patches.sh' to copy the patches from the git repo # to the current directory. @@ -69,6 +69,8 @@ Patch0016: 0016-test-data-phony-guests-Fix-phony-RPM-database-fix-vi.patch Patch0017: 0017-launch-libvirt-place-our-virtio-net-pci-device-in-sl.patch Patch0018: 0018-lib-extract-NETWORK_ADDRESS-and-NETWORK_PREFIX-as-ma.patch Patch0019: 0019-launch-libvirt-add-virtio-net-via-the-standard-inter.patch +Patch0020: 0020-appliance-Use-cpu-max.patch +Patch0021: 0021-appliance-Use-cpu-mode-maximum-for-cpu-max-on-libvir.patch # Replacement README file. Source4: README-replacement.in @@ -129,7 +131,8 @@ BuildRequires: systemd-units BuildRequires: netpbm-progs BuildRequires: icoutils # RHBZ#1710713 (RHBZ#1661940) -BuildRequires: libvirt-daemon-kvm >= 5.3.0 +# libvirt must support -cpu max +BuildRequires: libvirt-daemon-kvm >= 8.0.0 BuildRequires: libacl-devel BuildRequires: libcap-devel # https://bugzilla.redhat.com/show_bug.cgi?id=1836094 @@ -329,7 +332,8 @@ Requires: /usr/bin/qemu-img # For libvirt backend. # RHBZ#1500870, RHBZ#1501239, RHBZ#1508299 -Requires: libvirt-daemon-kvm >= 5.3.0 +# libvirt must support -cpu max +Requires: libvirt-daemon-kvm >= 8.0.0 %ifarch aarch64 Requires: edk2-aarch64 %endif @@ -1182,6 +1186,10 @@ rm ocaml/html/.gitignore %changelog +* Thu Apr 14 2022 Richard W.M. Jones - 1:1.44.0-6 +- Backport support for -cpu max to allow RHEL 9 guests to be modified + resolves: rhbz#2075424 + * Fri Dec 24 2021 Richard W.M. Jones - 1:1.44.0-5 - Fix libguestfs failure with qemu 6.2, libvirt 7.10 resolves: rhbz#2035177