libvirt-7.4.0-1.el9

- Rebased to libvirt-7.4.0 (rhbz#1950948) - The rebase also fixes the following bugs: rhbz#1960993 Resolves: rhbz#1950948, rhbz#1960993
2021-06-07 12:19:34 +02:00 · 2021-06-07 12:19:34 +02:00 · ecfafb711e
commit ecfafb711e
parent f99fdbd1ec
13 changed files with 127 additions and 143 deletions
--- a/gating.yaml
+++ b/gating.yaml
@ -1,3 +1,4 @@
+# recipients: libvirt-qe
 --- !Policy
 product_versions:
  - rhel-9
--- a/libvirt-RHEL-Enable-usage-of-x-blockdev-reopen.patch
+++ b/libvirt-RHEL-Enable-usage-of-x-blockdev-reopen.patch
@ -1,5 +1,5 @@
-From 99c1665ce717c86ae8bc300259fbc246cdf9ae06 Mon Sep 17 00:00:00 2001
-Message-Id: <99c1665ce717c86ae8bc300259fbc246cdf9ae06@dist-git>
+From 44a70fb199212fcfa762979d1dfa0a7b6f6eaa34 Mon Sep 17 00:00:00 2001
+Message-Id: <44a70fb199212fcfa762979d1dfa0a7b6f6eaa34@dist-git>
 From: Peter Krempa <pkrempa@redhat.com>
 Date: Mon, 16 Mar 2020 22:12:34 +0100
 Subject: [PATCH] RHEL: Enable usage of x-blockdev-reopen
@ -32,10 +32,10 @@ Reviewed-by: Ján Tomko <jtomko@redhat.com>
 7 files changed, 30 insertions(+), 8 deletions(-)

 diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
-index 89f20eb1d2..e738433b04 100644
+index 6627d044cd..a531bdd704 100644
 --- a/src/qemu/qemu_block.c
 +++ b/src/qemu/qemu_block.c
-@@ -3305,6 +3305,7 @@ qemuBlockReopenFormat(virDomainObj *vm,
+@@ -3317,6 +3317,7 @@ qemuBlockReopenFormat(virDomainObj *vm,
     qemuDomainObjPrivate *priv = vm->privateData;
     virQEMUDriver *driver = priv->driver;
     g_autoptr(virJSONValue) reopenprops = NULL;
@ -43,7 +43,7 @@ index 89f20eb1d2..e738433b04 100644
     int rc;
 
     /* If we are lacking the object here, qemu might have opened an image with
-@@ -3321,7 +3322,7 @@ qemuBlockReopenFormat(virDomainObj *vm,
+@@ -3333,7 +3334,7 @@ qemuBlockReopenFormat(virDomainObj *vm,
     if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0)
         return -1;
 
@ -53,18 +53,18 @@ index 89f20eb1d2..e738433b04 100644
     if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0)
         return -1;
 diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index 7971a9c557..e2f4d6af7e 100644
+index 75dd01f06e..9f33e57d8e 100644
 --- a/src/qemu/qemu_capabilities.c
 +++ b/src/qemu/qemu_capabilities.c
-@@ -629,6 +629,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
-               /* 400 */
+@@ -630,6 +630,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
               "compat-deprecated",
               "acpi-index",
+               "input-linux",
 +              "blockdev-reopen.__com.redhat_rhel-av-8_2_0-api",
     );
 
 
-@@ -1542,6 +1543,7 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVhostUserFS[] =
+@@ -1544,6 +1545,7 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVhostUserFS[] =
 
 /* see documentation for virQEMUQAPISchemaPathGet for the query format */
 static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
@ -72,7 +72,7 @@ index 7971a9c557..e2f4d6af7e 100644
     { "blockdev-add/arg-type/options/+gluster/debug-level", QEMU_CAPS_GLUSTER_DEBUG_LEVEL},
     { "blockdev-add/arg-type/+gluster/debug", QEMU_CAPS_GLUSTER_DEBUG_LEVEL},
     { "blockdev-add/arg-type/+vxhs", QEMU_CAPS_VXHS},
-@@ -5323,6 +5325,15 @@ virQEMUCapsInitProcessCaps(virQEMUCaps *qemuCaps)
+@@ -5192,6 +5194,15 @@ virQEMUCapsInitProcessCaps(virQEMUCaps *qemuCaps)
         qemuCaps->arch == VIR_ARCH_MIPS)
         virQEMUCapsSet(qemuCaps, QEMU_CAPS_SCSI_NCR53C90);
 
@ -89,22 +89,22 @@ index 7971a9c557..e2f4d6af7e 100644
 }
 
 diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
-index f54aad5dfd..51e256e317 100644
+index 94f2fad05a..97448e54e3 100644
 --- a/src/qemu/qemu_capabilities.h
 +++ b/src/qemu/qemu_capabilities.h
-@@ -609,6 +609,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
-     /* 400 */
+@@ -610,6 +610,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     QEMU_CAPS_COMPAT_DEPRECATED, /* -compat deprecated-(input|output) is supported */
     QEMU_CAPS_ACPI_INDEX, /* PCI device 'acpi-index' property */
+     QEMU_CAPS_INPUT_LINUX, /* -object input-linux */
 +    QEMU_CAPS_BLOCKDEV_REOPEN_COM_REDHAT_AV_8_2_0_API, /* downstream support for blockdev reopen in rhel-av-8.2.0 */
 
     QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;
 diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
-index 23161a0088..d5b53975f6 100644
+index 8f35b4240f..14e38a2abc 100644
 --- a/src/qemu/qemu_monitor.c
 +++ b/src/qemu/qemu_monitor.c
-@@ -4484,14 +4484,15 @@ qemuMonitorBlockdevAdd(qemuMonitor *mon,
+@@ -4458,14 +4458,15 @@ qemuMonitorBlockdevAdd(qemuMonitor *mon,
 
 int
 qemuMonitorBlockdevReopen(qemuMonitor *mon,
@ -123,10 +123,10 @@ index 23161a0088..d5b53975f6 100644
 
 
 diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
-index 420a85942a..759f9e1284 100644
+index 6a25def78b..14bfbb600e 100644
 --- a/src/qemu/qemu_monitor.h
 +++ b/src/qemu/qemu_monitor.h
-@@ -1374,7 +1374,8 @@ int qemuMonitorBlockdevAdd(qemuMonitor *mon,
+@@ -1371,7 +1371,8 @@ int qemuMonitorBlockdevAdd(qemuMonitor *mon,
                            virJSONValue **props);
 
 int qemuMonitorBlockdevReopen(qemuMonitor *mon,
@ -137,10 +137,10 @@ index 420a85942a..759f9e1284 100644
 int qemuMonitorBlockdevDel(qemuMonitor *mon,
                            const char *nodename);
 diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
-index 8de0e4b638..702c6fb8a1 100644
+index 46aa3330a8..1a5c3a6f4d 100644
 --- a/src/qemu/qemu_monitor_json.c
 +++ b/src/qemu/qemu_monitor_json.c
-@@ -8836,13 +8836,19 @@ qemuMonitorJSONBlockdevAdd(qemuMonitor *mon,
+@@ -8746,13 +8746,19 @@ qemuMonitorJSONBlockdevAdd(qemuMonitor *mon,
 
 int
 qemuMonitorJSONBlockdevReopen(qemuMonitor *mon,
@ -164,10 +164,10 @@ index 8de0e4b638..702c6fb8a1 100644
     if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
         return -1;
 diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
-index 8d8f2de479..b42fb8f83e 100644
+index 01a3ba25f1..90792c9939 100644
 --- a/src/qemu/qemu_monitor_json.h
 +++ b/src/qemu/qemu_monitor_json.h
-@@ -607,7 +607,8 @@ int qemuMonitorJSONBlockdevAdd(qemuMonitor *mon,
+@@ -601,7 +601,8 @@ int qemuMonitorJSONBlockdevAdd(qemuMonitor *mon,
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
 
 int qemuMonitorJSONBlockdevReopen(qemuMonitor *mon,
--- a/libvirt-RHEL-Fix-virConnectGetMaxVcpus-output.patch
+++ b/libvirt-RHEL-Fix-virConnectGetMaxVcpus-output.patch
@ -1,5 +1,5 @@
-From 3ba196a5b2135dcafec1d5377fc331772a6e11fa Mon Sep 17 00:00:00 2001
-Message-Id: <3ba196a5b2135dcafec1d5377fc331772a6e11fa@dist-git>
+From 74a928fc91e016d5b6628dcd6f7e005798d6836a Mon Sep 17 00:00:00 2001
+Message-Id: <74a928fc91e016d5b6628dcd6f7e005798d6836a@dist-git>
 From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
 Date: Mon, 27 Aug 2018 13:09:38 +0200
 Subject: [PATCH] RHEL: Fix virConnectGetMaxVcpus output
--- a/libvirt-RHEL-qemu-Add-ability-to-set-sgio-values-for-hostdev.patch
+++ b/libvirt-RHEL-qemu-Add-ability-to-set-sgio-values-for-hostdev.patch
@ -1,5 +1,5 @@
-From 5d6681c6117b2686c79f4748903bc3c209b5ab86 Mon Sep 17 00:00:00 2001
-Message-Id: <5d6681c6117b2686c79f4748903bc3c209b5ab86@dist-git>
+From c4182edf706fda88e3f144de3c93983b7a6c21b5 Mon Sep 17 00:00:00 2001
+Message-Id: <c4182edf706fda88e3f144de3c93983b7a6c21b5@dist-git>
 From: John Ferlan <jferlan@redhat.com>
 Date: Mon, 17 Dec 2018 20:42:30 -0500
 Subject: [PATCH] RHEL: qemu: Add ability to set sgio values for hostdev
--- a/libvirt-RHEL-qemu-Add-check-for-unpriv-sgio-for-SCSI-generic-host-device.patch
+++ b/libvirt-RHEL-qemu-Add-check-for-unpriv-sgio-for-SCSI-generic-host-device.patch
@ -1,5 +1,5 @@
-From 92a78c70050e7c37a0cbba1f2da8382fdf25d119 Mon Sep 17 00:00:00 2001
-Message-Id: <92a78c70050e7c37a0cbba1f2da8382fdf25d119@dist-git>
+From b7cd8139a3f7b09ccb99b36201f8df768fe4677e Mon Sep 17 00:00:00 2001
+Message-Id: <b7cd8139a3f7b09ccb99b36201f8df768fe4677e@dist-git>
 From: John Ferlan <jferlan@redhat.com>
 Date: Mon, 17 Dec 2018 20:42:31 -0500
 Subject: [PATCH] RHEL: qemu: Add check for unpriv sgio for SCSI generic host
--- a/libvirt-RHEL-virscsi-Check-device-type-before-getting-it-s-dev-node-name.patch
+++ b/libvirt-RHEL-virscsi-Check-device-type-before-getting-it-s-dev-node-name.patch
@ -1,5 +1,5 @@
-From 62349827c097fe9a304c41cc6426369f81b27de8 Mon Sep 17 00:00:00 2001
-Message-Id: <62349827c097fe9a304c41cc6426369f81b27de8@dist-git>
+From f959b3e81ab6fe0b5e311ea10293d1fd05365f40 Mon Sep 17 00:00:00 2001
+Message-Id: <f959b3e81ab6fe0b5e311ea10293d1fd05365f40@dist-git>
 From: Michal Privoznik <mprivozn@redhat.com>
 Date: Fri, 6 Mar 2020 15:52:21 +0100
 Subject: [PATCH] RHEL: virscsi: Check device type before getting it's /dev
--- a/libvirt-RHEL-virscsi-Introduce-and-use-virSCSIDeviceGetUnprivSGIOSysfsPath.patch
+++ b/libvirt-RHEL-virscsi-Introduce-and-use-virSCSIDeviceGetUnprivSGIOSysfsPath.patch
@ -1,5 +1,5 @@
-From 457743256ed748642b58ab4edb7166f63fc3c8de Mon Sep 17 00:00:00 2001
-Message-Id: <457743256ed748642b58ab4edb7166f63fc3c8de@dist-git>
+From 4c0403b06ae7fa23fcf2f4dacab9fb5a57eb4985 Mon Sep 17 00:00:00 2001
+Message-Id: <4c0403b06ae7fa23fcf2f4dacab9fb5a57eb4985@dist-git>
 From: Michal Privoznik <mprivozn@redhat.com>
 Date: Fri, 6 Mar 2020 15:52:23 +0100
 Subject: [PATCH] RHEL: virscsi: Introduce and use
@ -30,10 +30,10 @@ Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
 6 files changed, 49 insertions(+), 31 deletions(-)

 diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index 9f761c2c00..2dcf4875bb 100644
+index 0ced2a7990..de0d9b101d 100644
 --- a/src/libvirt_private.syms
 +++ b/src/libvirt_private.syms
-@@ -3144,6 +3144,7 @@ virSCSIDeviceGetSgName;
+@@ -3156,6 +3156,7 @@ virSCSIDeviceGetSgName;
 virSCSIDeviceGetShareable;
 virSCSIDeviceGetTarget;
 virSCSIDeviceGetUnit;
@ -166,10 +166,10 @@ index 65ad15ed76..5721985939 100644
 virSCSIDevice *virSCSIDeviceNew(const char *sysfs_prefix,
                                   const char *adapter,
 diff --git a/src/util/virutil.c b/src/util/virutil.c
-index 3f49a469e5..970b9f1fec 100644
+index 311cbbf93a..198ee8d591 100644
 --- a/src/util/virutil.c
 +++ b/src/util/virutil.c
-@@ -1387,18 +1387,13 @@ virGetUnprivSGIOSysfsPath(const char *path,
+@@ -1384,18 +1384,13 @@ virGetUnprivSGIOSysfsPath(const char *path,
 
 int
 virSetDeviceUnprivSGIO(const char *path,
@ -189,7 +189,7 @@ index 3f49a469e5..970b9f1fec 100644
         virReportError(VIR_ERR_OPERATION_INVALID, "%s",
                        _("unpriv_sgio is not supported by this kernel"));
         goto cleanup;
-@@ -1406,38 +1401,32 @@ virSetDeviceUnprivSGIO(const char *path,
+@@ -1403,38 +1398,32 @@ virSetDeviceUnprivSGIO(const char *path,
 
     val = g_strdup_printf("%d", unpriv_sgio);
 
@ -232,7 +232,7 @@ index 3f49a469e5..970b9f1fec 100644
         goto cleanup;
 
     if ((tmp = strchr(buf, '\n')))
-@@ -1445,13 +1434,12 @@ virGetDeviceUnprivSGIO(const char *path,
+@@ -1442,13 +1431,12 @@ virGetDeviceUnprivSGIO(const char *path,
 
     if (virStrToLong_i(buf, NULL, 10, unpriv_sgio) < 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
--- a/libvirt-RHEL-virscsi-Support-TAPEs-in-virSCSIDeviceGetDevName.patch
+++ b/libvirt-RHEL-virscsi-Support-TAPEs-in-virSCSIDeviceGetDevName.patch
@ -1,5 +1,5 @@
-From e089400f1343ef4c4e735dbcc5c966b50fdab70f Mon Sep 17 00:00:00 2001
-Message-Id: <e089400f1343ef4c4e735dbcc5c966b50fdab70f@dist-git>
+From 7284ac8d7fc2351bcf0c663dd8179c90eb2158bc Mon Sep 17 00:00:00 2001
+Message-Id: <7284ac8d7fc2351bcf0c663dd8179c90eb2158bc@dist-git>
 From: Michal Privoznik <mprivozn@redhat.com>
 Date: Fri, 6 Mar 2020 15:52:22 +0100
 Subject: [PATCH] RHEL: virscsi: Support TAPEs in virSCSIDeviceGetDevName()
@ -125,7 +125,7 @@ diff --git a/tests/virscsidata/sg3 b/tests/virscsidata/sg3
 new file mode 100644
 index 0000000000..e69de29bb2
 diff --git a/tests/virscsitest.c b/tests/virscsitest.c
-index 84b6f15ec6..a897de918c 100644
+index 0d7c35a261..0647bb4841 100644
 --- a/tests/virscsitest.c
 +++ b/tests/virscsitest.c
@@ -33,18 +33,34 @@ VIR_LOG_INIT("tests.scsitest");
--- a/libvirt-RHEL-virutil-Accept-non-block-devices-in-virGetDeviceID.patch
+++ b/libvirt-RHEL-virutil-Accept-non-block-devices-in-virGetDeviceID.patch
@ -1,5 +1,5 @@
-From c37b04bc3d636d8d96f9e40075336ff5166d5585 Mon Sep 17 00:00:00 2001
-Message-Id: <c37b04bc3d636d8d96f9e40075336ff5166d5585@dist-git>
+From 79a94d508777bfa7118ac7fe60eb1eb5143f3f70 Mon Sep 17 00:00:00 2001
+Message-Id: <79a94d508777bfa7118ac7fe60eb1eb5143f3f70@dist-git>
 From: Michal Privoznik <mprivozn@redhat.com>
 Date: Fri, 6 Mar 2020 15:52:24 +0100
 Subject: [PATCH] RHEL: virutil: Accept non-block devices in virGetDeviceID()
@ -19,10 +19,10 @@ Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
 1 file changed, 3 deletions(-)

 diff --git a/src/util/virutil.c b/src/util/virutil.c
-index 970b9f1fec..135e1e5943 100644
+index 198ee8d591..1e51cdf0cb 100644
 --- a/src/util/virutil.c
 +++ b/src/util/virutil.c
-@@ -1343,9 +1343,6 @@ virGetDeviceID(const char *path, int *maj, int *min)
+@@ -1340,9 +1340,6 @@ virGetDeviceID(const char *path, int *maj, int *min)
     if (stat(path, &sb) < 0)
         return -errno;
 
--- a/libvirt.spec
+++ b/libvirt.spec
@ -3,26 +3,15 @@
 # This spec file assumes you are building on a Fedora or RHEL version
 # that's still supported by the vendor. It may work on other distros
 # or versions, but no effort will be made to ensure that going forward.
-%define min_rhel 7
-%define min_fedora 31
-
-%if 0%{?fedora} >= %{min_fedora} || 0%{?rhel} >= %{min_rhel}
-    %define supported_platform 1
-%else
-    %define supported_platform 0
-%endif
-
-# On RHEL 7 and older macro _vpath_builddir is not defined.
-%if 0%{?rhel} && 0%{?rhel} <= 7
-    %define _vpath_builddir %{_target_platform}
-%endif
+%define min_rhel 8
+%define min_fedora 33

 %define arches_qemu_kvm         %{ix86} x86_64 %{power64} %{arm} aarch64 s390x
 %if 0%{?rhel}
-    %if 0%{?rhel} <= 8
-        %define arches_qemu_kvm     x86_64 %{power64} aarch64 s390x
-    %else
+    %if 0%{?rhel} > 8
        %define arches_qemu_kvm     x86_64 aarch64 s390x
+    %else
+        %define arches_qemu_kvm     x86_64 %{power64} aarch64 s390x
    %endif
 %endif

@ -76,26 +65,26 @@
 %endif

 %define with_storage_gluster 0%{!?_without_storage_gluster:1}
-%ifnarch %{arches_qemu_kvm}
-    # gluster is only built where qemu driver is enabled on RHEL 8
-    %if 0%{?rhel} >= 8
+%if 0%{?rhel}
+    # Glusterfs has been dropped in RHEL-9, and before that
+    # was only enabled on arches where KVM exists
+    %if 0%{?rhel} > 8
        %define with_storage_gluster 0
+    %else
+        %ifnarch %{arches_qemu_kvm}
+            %define with_storage_gluster 0
+        %endif
    %endif
 %endif

-# F25+ has zfs-fuse
+# Fedora has zfs-fuse
 %if 0%{?fedora}
    %define with_storage_zfs      0%{!?_without_storage_zfs:1}
 %else
    %define with_storage_zfs      0
 %endif

-# We need a recent enough libiscsi (>= 1.18.0)
-%if 0%{?fedora} || 0%{?rhel} > 7
-    %define with_storage_iscsi_direct 0%{!?_without_storage_iscsi_direct:1}
-%else
-    %define with_storage_iscsi_direct 0
-%endif
+%define with_storage_iscsi_direct 0%{!?_without_storage_iscsi_direct:1}

 # Other optional features
 %define with_numactl          0%{!?_without_numactl:1}
@ -130,9 +119,7 @@
    %define with_storage_rbd 0
 %endif

-# RHEL doesn't ship OpenVZ, VBox, PowerHypervisor,
-# VMware, libxenlight (Xen 4.1 and newer),
-# or HyperV.
+# RHEL doesn't ship many hypervisor drivers
 %if 0%{?rhel}
    %define with_openvz 0
    %define with_vbox 0
@ -140,15 +127,10 @@
    %define with_libxl 0
    %define with_hyperv 0
    %define with_vz 0
-
-    %if 0%{?rhel} > 7
-        %define with_lxc 0
-    %endif
+    %define with_lxc 0
 %endif

-%if 0%{?fedora} || 0%{?rhel} > 7
-    %define with_firewalld_zone 0%{!?_without_firewalld_zone:1}
-%endif
+%define with_firewalld_zone 0%{!?_without_firewalld_zone:1}

 %if (0%{?fedora} && 0%{?fedora} < 34) || (0%{?rhel} && 0%{?rhel} < 9)
    %define with_netcf 0%{!?_without_netcf:1}
@ -176,16 +158,12 @@
    %define with_libssh2 0%{!?_without_libssh2:1}
 %endif

-# Enable wireshark plugins for all distros except RHEL-7
-%if 0%{?fedora} || 0%{?rhel} > 7
-    %define with_wireshark 0%{!?_without_wireshark:1}
-    %define wireshark_plugindir %(pkg-config --variable plugindir wireshark)/epan
-%endif
+# Enable wireshark plugins for all distros
+%define with_wireshark 0%{!?_without_wireshark:1}
+%define wireshark_plugindir %(pkg-config --variable plugindir wireshark)/epan

-# Enable libssh transport for new enough distros
-%if 0%{?fedora} || 0%{?rhel} > 7
-    %define with_libssh 0%{!?_without_libssh:1}
-%endif
+# Enable libssh transport for all distros
+%define with_libssh 0%{!?_without_libssh:1}

 %if %{with_qemu} || %{with_lxc}
 # numad is used to manage the CPU and memory placement dynamically,
@ -213,16 +191,12 @@
    %define enable_werror -Dwerror=false
 %endif

-%if 0%{?rhel} == 7
-    %define tls_priority "NORMAL"
-%else
-    %define tls_priority "@LIBVIRT,SYSTEM"
-%endif
+%define tls_priority "@LIBVIRT,SYSTEM"


 Summary: Library providing a simple virtualization API
 Name: libvirt
-Version: 7.3.0
+Version: 7.4.0
 Release: 1%{?dist}%{?extra_release}
 License: LGPLv2+
 URL: https://libvirt.org/
@ -272,20 +246,12 @@ Requires: libvirt-libs = %{version}-%{release}

 # All build-time requirements. Run-time requirements are
 # listed against each sub-RPM
-%if 0%{?rhel} == 7
-BuildRequires: python36-docutils
-%else
 BuildRequires: python3-docutils
-%endif
 BuildRequires: gcc
 BuildRequires: meson >= 0.54.0
 BuildRequires: ninja-build
 BuildRequires: git
-%if 0%{?fedora} || 0%{?rhel} > 7
 BuildRequires: perl-interpreter
-%else
-BuildRequires: perl
-%endif
 BuildRequires: python3
 BuildRequires: systemd-units
 %if %{with_libxl}
@ -343,13 +309,8 @@ BuildRequires: device-mapper-devel
 # For XFS reflink clone support
 BuildRequires: xfsprogs-devel
 %if %{with_storage_rbd}
-    %if 0%{?fedora} || 0%{?rhel} > 7
 BuildRequires: librados-devel
 BuildRequires: librbd-devel
-    %else
-BuildRequires: librados2-devel
-BuildRequires: librbd1-devel
-    %endif
 %endif
 %if %{with_storage_gluster}
 BuildRequires: glusterfs-api-devel >= 3.4.1
@ -411,11 +372,7 @@ BuildRequires: wireshark-devel
 BuildRequires: libssh-devel >= 0.7.0
 %endif

-# On RHEL-7 rpcgen is still part of glibc-common package
-%if 0%{?fedora} || 0%{?rhel} > 7
 BuildRequires: rpcgen
-%endif
-
 BuildRequires: libtirpc-devel

 # Needed for the firewalld_reload macro
@ -450,12 +407,10 @@ Requires: /usr/bin/nc
 # for modprobe of pci devices
 Requires: module-init-tools

-# for /sbin/ip & /sbin/tc
+# for /sbin/ip
 Requires: iproute
-# tc is provided by iproute-tc since at least Fedora 26
-%if 0%{?fedora} || 0%{?rhel} > 7
+# for /sbin/tc
 Requires: iproute-tc
-%endif

 Requires: polkit >= 0.112
 %if %{with_dmidecode}
@ -479,7 +434,7 @@ Requires: gettext

 # Ensure smooth upgrades
 Obsoletes: libvirt-admin < 7.3.0
-Provides: libvirt-admin
+Provides: libvirt-admin = %{version}-%{release}
 Obsoletes: libvirt-bash-completion < 7.3.0

 %description daemon
@ -539,9 +494,7 @@ Requires: libvirt-libs = %{version}-%{release}
 # needed for device enumeration
 Requires: systemd >= 185
 # For managing persistent mediated devices
-%if 0%{?fedora} || 0%{?rhel} > 7
 Requires: mdevctl
-%endif

 %description daemon-driver-nodedev
 The nodedev driver plugin for the libvirtd daemon, providing
@ -639,7 +592,6 @@ volumes using the host iscsi stack.
 Summary: Storage driver plugin for iscsi-direct
 Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
 Requires: libvirt-libs = %{version}-%{release}
-Requires: libiscsi

 %description daemon-driver-storage-iscsi-direct
 The storage driver backend adding implementation of the storage APIs for iscsi
@ -757,12 +709,8 @@ Requires: gzip
 Requires: bzip2
 Requires: lzop
 Requires: xz
-    %if 0%{?fedora} || 0%{?rhel} > 7
 Requires: systemd-container
-    %endif
-    %if 0%{?fedora} || 0%{?rhel} > 7
 Requires: swtpm-tools
-    %endif

 %description daemon-driver-qemu
 The qemu driver plugin for the libvirtd daemon, providing
@ -778,9 +726,7 @@ Requires: libvirt-daemon = %{version}-%{release}
 Requires: libvirt-libs = %{version}-%{release}
 # There really is a hard cross-driver dependency here
 Requires: libvirt-daemon-driver-network = %{version}-%{release}
-    %if 0%{?fedora} || 0%{?rhel} > 7
 Requires: systemd-container
-    %endif

 %description daemon-driver-lxc
 The LXC driver plugin for the libvirtd daemon, providing
@ -1012,11 +958,10 @@ git config gc.auto 0
 %autopatch

 %build
-
-%if 0%{?fedora} == 34
-    # binutils change in F34 broke linking of tests
-    # https://bugzilla.redhat.com/show_bug.cgi?id=1889763
-    %define _lto_cflags %{nil}
+%if 0%{?fedora} >= %{min_fedora} || 0%{?rhel} >= %{min_rhel}
+    %define supported_platform 1
+%else
+    %define supported_platform 0
 %endif

 %if ! %{supported_platform}
@ -1326,16 +1271,6 @@ mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_qemu_probes.stp \
 # raising the test timeout
 VIR_TEST_DEBUG=1 %meson_test --no-suite syntax-check --timeout-multiplier 10

-%post libs
-%if 0%{?rhel} == 7
-/sbin/ldconfig
-%endif
-
-%postun libs
-%if 0%{?rhel} == 7
-/sbin/ldconfig
-%endif
-
 %pre daemon
 # 'libvirt' group is just to allow password-less polkit access to
 # libvirtd. The uid number is irrelevant, so we use dynamic allocation
@ -1984,6 +1919,11 @@ exit 0


 %changelog
+* Mon Jun  7 2021 Jiri Denemark <jdenemar@redhat.com> - 7.4.0-1
+- Rebased to libvirt-7.4.0 (rhbz#1950948)
+- The rebase also fixes the following bugs:
+    rhbz#1960993
+
 * Mon May 24 2021 Jiri Denemark <jdenemar@redhat.com> - 7.3.0-1
 - Rebased to libvirt-7.3.0 (rhbz#1950948)
 - The rebase also fixes the following bugs:
--- a/rpminspect.yaml
+++ b/rpminspect.yaml
@ -0,0 +1,5 @@
+emptyrpm:
+  expected_empty:
+    - libvirt
+    - libvirt-daemon-driver-storage
+    - libvirt-daemon-kvm
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (libvirt-7.3.0.tar.xz) = e039d5cc000c0f29ead4faddf154852ee8d8b5943e940b717eabb33cc9990d3f257a942b05a661bf6c36df5b5763c31df3f8b5a0fc21e8111a81c57da42d903e
+SHA512 (libvirt-7.4.0.tar.xz) = efe3fb2813613c3c5e94ed49d0cae4ad92cca6a727a8b55808d8c3bdfacb355642796dfab49362ee59654f9471f9134b96374ced50cc9b3227f4f1c6201bf7f1
--- a/40
+++ b/40
@ -9,6 +9,44 @@ tests/networkxml2xmlout/leasetime-hours.xml ../networkxml2xmlin/leasetime-hours.
 tests/networkxml2xmlout/leasetime-infinite.xml ../networkxml2xmlin/leasetime-infinite.xml
 tests/networkxml2xmlout/leasetime-minutes.xml ../networkxml2xmlin/leasetime-minutes.xml
 tests/networkxml2xmlout/leasetime-seconds.xml ../networkxml2xmlin/leasetime-seconds.xml
+tests/nodedevxml2xmlout/DVD_GCC_4247N.xml ../nodedevschemadata/DVD_GCC_4247N.xml
+tests/nodedevxml2xmlout/DVD_with_media.xml ../nodedevschemadata/DVD_with_media.xml
+tests/nodedevxml2xmlout/ap_07_0038.xml ../nodedevschemadata/ap_07_0038.xml
+tests/nodedevxml2xmlout/ap_card07.xml ../nodedevschemadata/ap_card07.xml
+tests/nodedevxml2xmlout/ap_matrix.xml ../nodedevschemadata/ap_matrix.xml
+tests/nodedevxml2xmlout/ap_matrix_mdev_types.xml ../nodedevschemadata/ap_matrix_mdev_types.xml
+tests/nodedevxml2xmlout/ccw_0_0_ffff.xml ../nodedevschemadata/ccw_0_0_ffff.xml
+tests/nodedevxml2xmlout/computer.xml ../nodedevschemadata/computer.xml
+tests/nodedevxml2xmlout/css_0_0_fffe_mdev_types.xml ../nodedevschemadata/css_0_0_fffe_mdev_types.xml
+tests/nodedevxml2xmlout/css_0_0_ffff.xml ../nodedevschemadata/css_0_0_ffff.xml
+tests/nodedevxml2xmlout/drm_renderD129.xml ../nodedevschemadata/drm_renderD129.xml
+tests/nodedevxml2xmlout/mdev_3627463d_b7f0_4fea_b468_f1da537d301b.xml ../nodedevschemadata/mdev_3627463d_b7f0_4fea_b468_f1da537d301b.xml
+tests/nodedevxml2xmlout/mdev_ee0b88c4_f554_4dc1_809d_b2a01e8e48ad.xml ../nodedevschemadata/mdev_ee0b88c4_f554_4dc1_809d_b2a01e8e48ad.xml
+tests/nodedevxml2xmlout/net_00_13_02_b9_f9_d3.xml ../nodedevschemadata/net_00_13_02_b9_f9_d3.xml
+tests/nodedevxml2xmlout/net_00_15_58_2f_e9_55.xml ../nodedevschemadata/net_00_15_58_2f_e9_55.xml
+tests/nodedevxml2xmlout/pci_0000_00_02_0_header_type.xml ../nodedevschemadata/pci_0000_00_02_0_header_type.xml
+tests/nodedevxml2xmlout/pci_0000_00_1c_0_header_type.xml ../nodedevschemadata/pci_0000_00_1c_0_header_type.xml
+tests/nodedevxml2xmlout/pci_0000_02_10_7_mdev_types.xml ../nodedevschemadata/pci_0000_02_10_7_mdev_types.xml
+tests/nodedevxml2xmlout/pci_0000_02_10_7_sriov.xml ../nodedevschemadata/pci_0000_02_10_7_sriov.xml
+tests/nodedevxml2xmlout/pci_0000_02_10_7_sriov_pf_vfs_all.xml ../nodedevschemadata/pci_0000_02_10_7_sriov_pf_vfs_all.xml
+tests/nodedevxml2xmlout/pci_0000_02_10_7_sriov_pf_vfs_all_header_type.xml ../nodedevschemadata/pci_0000_02_10_7_sriov_pf_vfs_all_header_type.xml
+tests/nodedevxml2xmlout/pci_0000_02_10_7_sriov_vfs.xml ../nodedevschemadata/pci_0000_02_10_7_sriov_vfs.xml
+tests/nodedevxml2xmlout/pci_0000_02_10_7_sriov_zero_vfs_max_count.xml ../nodedevschemadata/pci_0000_02_10_7_sriov_zero_vfs_max_count.xml
+tests/nodedevxml2xmlout/pci_1002_71c4.xml ../nodedevschemadata/pci_1002_71c4.xml
+tests/nodedevxml2xmlout/pci_8086_0c0c_snd_hda_intel.xml ../nodedevschemadata/pci_8086_0c0c_snd_hda_intel.xml
+tests/nodedevxml2xmlout/pci_8086_10c9_sriov_pf.xml ../nodedevschemadata/pci_8086_10c9_sriov_pf.xml
+tests/nodedevxml2xmlout/pci_8086_27c5_scsi_host.xml ../nodedevschemadata/pci_8086_27c5_scsi_host.xml
+tests/nodedevxml2xmlout/pci_8086_27c5_scsi_host_0.xml ../nodedevschemadata/pci_8086_27c5_scsi_host_0.xml
+tests/nodedevxml2xmlout/pci_8086_27c5_scsi_host_0_unique_id.xml ../nodedevschemadata/pci_8086_27c5_scsi_host_0_unique_id.xml
+tests/nodedevxml2xmlout/pci_8086_27c5_scsi_host_scsi_device_lun0.xml ../nodedevschemadata/pci_8086_27c5_scsi_host_scsi_device_lun0.xml
+tests/nodedevxml2xmlout/pci_8086_27c5_scsi_host_scsi_host.xml ../nodedevschemadata/pci_8086_27c5_scsi_host_scsi_host.xml
+tests/nodedevxml2xmlout/pci_8086_4238_pcie_wireless.xml ../nodedevschemadata/pci_8086_4238_pcie_wireless.xml
+tests/nodedevxml2xmlout/scsi_target0_0_0.xml ../nodedevschemadata/scsi_target0_0_0.xml
+tests/nodedevxml2xmlout/scsi_target1_0_0.xml ../nodedevschemadata/scsi_target1_0_0.xml
+tests/nodedevxml2xmlout/storage_serial_3600c0ff000d7a2a5d463ff4902000000.xml ../nodedevschemadata/storage_serial_3600c0ff000d7a2a5d463ff4902000000.xml
+tests/nodedevxml2xmlout/storage_serial_SATA_HTS721010G9SA00_MPCZ12Y0GNGWSE.xml ../nodedevschemadata/storage_serial_SATA_HTS721010G9SA00_MPCZ12Y0GNGWSE.xml
+tests/nodedevxml2xmlout/usb_device_1d6b_1_0000_00_1d_0.xml ../nodedevschemadata/usb_device_1d6b_1_0000_00_1d_0.xml
+tests/nodedevxml2xmlout/usb_device_1d6b_1_0000_00_1d_0_if0.xml ../nodedevschemadata/usb_device_1d6b_1_0000_00_1d_0_if0.xml
 tests/qemublocktestdata/imagecreate/qcow2-backing-luks.xml qcow2.xml
 tests/qemublocktestdata/imagecreate/qcow2-backing-qcow2-slice.xml qcow2.xml
 tests/qemublocktestdata/imagecreate/qcow2-backing-raw-nbd.xml qcow2.xml
@ -61,7 +99,6 @@ tests/qemuxml2argvdata/pseries-features-ccf.xml pseries-features.xml
 tests/qemuxml2argvdata/pseries-features-cfpc.xml pseries-features.xml
 tests/qemuxml2argvdata/pseries-features-hpt-pagesize.xml pseries-features.xml
 tests/qemuxml2argvdata/pseries-features-htm.xml pseries-features.xml
-tests/qemuxml2argvdata/pseries-features-htp-resize.xml pseries-features.xml
 tests/qemuxml2argvdata/pseries-features-ibs.xml pseries-features.xml
 tests/qemuxml2argvdata/pseries-features-nested-hv.xml pseries-features.xml
 tests/qemuxml2argvdata/pseries-features-sbbc.xml pseries-features.xml
@ -131,6 +168,7 @@ tests/qemuxml2xmloutdata/hugepages-memaccess.xml ../qemuxml2argvdata/hugepages-m
 tests/qemuxml2xmloutdata/hugepages-memaccess2.xml ../qemuxml2argvdata/hugepages-memaccess2.xml
 tests/qemuxml2xmloutdata/hugepages-numa-default-dimm.xml ../qemuxml2argvdata/hugepages-numa-default-dimm.xml
 tests/qemuxml2xmloutdata/hugepages-nvdimm.xml ../qemuxml2argvdata/hugepages-nvdimm.xml
+tests/qemuxml2xmloutdata/input-linux.x86_64-latest.xml ../qemuxml2argvdata/input-linux.xml
 tests/qemuxml2xmloutdata/intel-iommu-aw-bits.x86_64-latest.xml ../qemuxml2argvdata/intel-iommu-aw-bits.xml
 tests/qemuxml2xmloutdata/intel-iommu-caching-mode.x86_64-latest.xml ../qemuxml2argvdata/intel-iommu-caching-mode.xml
 tests/qemuxml2xmloutdata/intel-iommu-device-iotlb.x86_64-latest.xml ../qemuxml2argvdata/intel-iommu-device-iotlb.xml