From 3ad71158321fa07e746cd3d1ba2866a42e7561dc Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 27 May 2021 17:16:43 +0100
Subject: [PATCH] New upstream version 1.45.6. Remove RHEL 9-only -cpu hack now
 that libvirt >= 7.1.0 is available.

related: rhbz#1950627
---
 ...-Use-cpu-mode-maximum-for-cpu-max-on.patch | 34 -------------------
 libguestfs.spec                               | 17 ++++------
 sources                                       |  4 +--
 3 files changed, 9 insertions(+), 46 deletions(-)
 delete mode 100644 0001-Revert-appliance-Use-cpu-mode-maximum-for-cpu-max-on.patch

diff --git a/0001-Revert-appliance-Use-cpu-mode-maximum-for-cpu-max-on.patch b/0001-Revert-appliance-Use-cpu-mode-maximum-for-cpu-max-on.patch
deleted file mode 100644
index e1709ee..0000000
--- a/0001-Revert-appliance-Use-cpu-mode-maximum-for-cpu-max-on.patch
+++ /dev/null
@@ -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
-
diff --git a/libguestfs.spec b/libguestfs.spec
index 3621d92..c3f8bef 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -60,7 +60,7 @@
 Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
-Version:       1.45.5
+Version:       1.45.6
 Release:       1%{?dist}
 License:       LGPLv2+
 
@@ -95,11 +95,6 @@ Source7:       libguestfs.keyring
 # Maintainer script which helps with handling patches.
 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.
 %if 0%{?rhel}
 Patch9001:     0001-RHEL-Remove-libguestfs-live-RHBZ-798980.patch
@@ -151,8 +146,7 @@ BuildRequires: unzip
 BuildRequires: systemd-units
 BuildRequires: netpbm-progs
 BuildRequires: icoutils
-BuildRequires: libvirt-daemon-kvm
-#BuildRequires: libvirt-daemon-kvm >= 7.1.0
+BuildRequires: libvirt-daemon-kvm >= 7.1.0
 %if !0%{?rhel}
 BuildRequires: perl(Expect)
 %endif
@@ -347,8 +341,7 @@ Suggests:      qemu-block-iscsi
 Suggests:      qemu-block-rbd
 Suggests:      qemu-block-ssh
 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
 Recommends:    libvirt-daemon-driver-storage-core
 Requires:      selinux-policy >= 3.11.1-63
@@ -1126,6 +1119,10 @@ rm ocaml/html/.gitignore
 
 
 %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
 - New upstream development version 1.45.5.
 
diff --git a/sources b/sources
index e0ee108..33a2bac 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (libguestfs-1.45.5.tar.gz) = 8caa03d6dd94f5f81c571fc344efa292442faa6cd3b9ab542be817c3e1cd0b2d6923b75775ba94ed754e4aa7eca8ab37a796149dde7175dc5d6c1c3d60004a0e
-SHA512 (libguestfs-1.45.5.tar.gz.sig) = ebdd284cad708c8e714315f1ff850018b7bd73ca0faac7a24c0b4c4e96df0fe62ee5b9e843830a05f749606d588d5c2c354ecfed42e205128dc71f10ef7f1fae
+SHA512 (libguestfs-1.45.6.tar.gz) = 018aec83d153aeabb7c0b255e6d5b40b03ff6d0de12dc1e0557fc35215db593aaa871c4bc1f44e785f74bf02a367aec0e90157f8ff159cccc820ebf1afd2258a
+SHA512 (libguestfs-1.45.6.tar.gz.sig) = 8f0be35a265356e7bd823b3d9302449ac62d633de8a9bd40ca457bcb4e4d2aebc827c4867bfdb6f3e3a4f34ade168103f5af0a44b667c875be7721e275433dbe