New upstream version 1.45.6.

Remove RHEL 9-only -cpu hack now that libvirt >= 7.1.0 is available.

related: rhbz#1950627
This commit is contained in:
Richard W.M. Jones 2021-05-27 17:16:43 +01:00
parent ef6a71e809
commit 3ad7115832
3 changed files with 9 additions and 46 deletions

View File

@ -1,34 +0,0 @@
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

View File

@ -60,7 +60,7 @@
Summary: Access and modify virtual machine disk images Summary: Access and modify virtual machine disk images
Name: libguestfs Name: libguestfs
Epoch: 1 Epoch: 1
Version: 1.45.5 Version: 1.45.6
Release: 1%{?dist} Release: 1%{?dist}
License: LGPLv2+ License: LGPLv2+
@ -95,11 +95,6 @@ Source7: libguestfs.keyring
# Maintainer script which helps with handling patches. # Maintainer script which helps with handling patches.
Source8: copy-patches.sh Source8: copy-patches.sh
# Non-upstream patch which reverts (temporarily) libvirt cpu maximum.
# This feature requires libvirt 7.1 which is not currently available
# in Fedora 34.
Patch3: 0001-Revert-appliance-Use-cpu-mode-maximum-for-cpu-max-on.patch
# Downstream (RHEL-only) patches. # Downstream (RHEL-only) patches.
%if 0%{?rhel} %if 0%{?rhel}
Patch9001: 0001-RHEL-Remove-libguestfs-live-RHBZ-798980.patch Patch9001: 0001-RHEL-Remove-libguestfs-live-RHBZ-798980.patch
@ -151,8 +146,7 @@ BuildRequires: unzip
BuildRequires: systemd-units BuildRequires: systemd-units
BuildRequires: netpbm-progs BuildRequires: netpbm-progs
BuildRequires: icoutils BuildRequires: icoutils
BuildRequires: libvirt-daemon-kvm BuildRequires: libvirt-daemon-kvm >= 7.1.0
#BuildRequires: libvirt-daemon-kvm >= 7.1.0
%if !0%{?rhel} %if !0%{?rhel}
BuildRequires: perl(Expect) BuildRequires: perl(Expect)
%endif %endif
@ -347,8 +341,7 @@ Suggests: qemu-block-iscsi
Suggests: qemu-block-rbd Suggests: qemu-block-rbd
Suggests: qemu-block-ssh Suggests: qemu-block-ssh
Recommends: libvirt-daemon-config-network Recommends: libvirt-daemon-config-network
Requires: libvirt-daemon-driver-qemu Requires: libvirt-daemon-driver-qemu >= 7.1.0
#Requires: libvirt-daemon-driver-qemu >= 7.1.0
Requires: libvirt-daemon-driver-secret Requires: libvirt-daemon-driver-secret
Recommends: libvirt-daemon-driver-storage-core Recommends: libvirt-daemon-driver-storage-core
Requires: selinux-policy >= 3.11.1-63 Requires: selinux-policy >= 3.11.1-63
@ -1126,6 +1119,10 @@ rm ocaml/html/.gitignore
%changelog %changelog
* Thu May 27 2021 Richard W.M. Jones <rjones@redhat.com> - 1:1.45.6-1
- New upstream version 1.45.6.
- Remove RHEL 9-only -cpu hack now that libvirt >= 7.1.0 is available.
* Fri Apr 09 2021 Richard W.M. Jones <rjones@redhat.com> - 1:1.45.5-1 * Fri Apr 09 2021 Richard W.M. Jones <rjones@redhat.com> - 1:1.45.5-1
- New upstream development version 1.45.5. - New upstream development version 1.45.5.

View File

@ -1,2 +1,2 @@
SHA512 (libguestfs-1.45.5.tar.gz) = 8caa03d6dd94f5f81c571fc344efa292442faa6cd3b9ab542be817c3e1cd0b2d6923b75775ba94ed754e4aa7eca8ab37a796149dde7175dc5d6c1c3d60004a0e SHA512 (libguestfs-1.45.6.tar.gz) = 018aec83d153aeabb7c0b255e6d5b40b03ff6d0de12dc1e0557fc35215db593aaa871c4bc1f44e785f74bf02a367aec0e90157f8ff159cccc820ebf1afd2258a
SHA512 (libguestfs-1.45.5.tar.gz.sig) = ebdd284cad708c8e714315f1ff850018b7bd73ca0faac7a24c0b4c4e96df0fe62ee5b9e843830a05f749606d588d5c2c354ecfed42e205128dc71f10ef7f1fae SHA512 (libguestfs-1.45.6.tar.gz.sig) = 8f0be35a265356e7bd823b3d9302449ac62d633de8a9bd40ca457bcb4e4d2aebc827c4867bfdb6f3e3a4f34ade168103f5af0a44b667c875be7721e275433dbe