libvirt-6.6.0-5

Fix noisy log error 'Failed to open file ...unique_id...' (bz #1692100)
Fix USB device error 'vendor cannot be 0' (bz #1897625)

.abignore

@@ -0,0 +1,31 @@
+[suppress_function]
+symbol_version_regexp = LIBVIRT_PRIVATE.*
+soname_regexp = libvirt\\.so.*
+
+[suppress_function]
+symbol_version_regexp = LIBVIRT_ADMIN_PRIVATE.*
+soname_regexp = libvirt-admin\\.so.*
+
+[suppress_variable]
+symbol_version_regexp = LIBVIRT_PRIVATE.*
+soname_regexp = libvirt\\.so.*
+
+[suppress_variable]
+symbol_version_regexp = LIBVIRT_ADMIN_PRIVATE.*
+soname_regexp = libvirt-admin\\.so.*
+
+[suppress_function]
+symbol_version_regexp = .*
+soname_regexp = libvirt_storage_.*\\.so.*
+
+[suppress_variable]
+symbol_version_regexp = .*
+soname_regexp = libvirt_storage_.*\\.so.*
+
+[suppress_function]
+symbol_version_regexp = .*
+soname_regexp = libvirt_driver_.*\\.so.*
+
+[suppress_variable]
+symbol_version_regexp = .*
+soname_regexp = libvirt_driver_.*\\.so.*

.gitignore

@@ -2,4 +2,4 @@
 *.rpm
 i686
 x86_64
-libvirt-*.tar.gz
+libvirt-*.tar.xz

0001-qemu-support-virt-2.6-machine-type-on-arm.patch

@@ -1,165 +0,0 @@
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Fri, 8 Apr 2016 10:46:41 +0200
-Subject: [PATCH] qemu: support virt-2.6 machine type on arm
-
-Some places already check for "virt-" prefix as well as plain "virt".
-virQEMUCapsHasPCIMultiBus did not, resulting in multiple PCI devices
-having assigned the same unnumbered "pci" alias.
-
-Add a test for the "virt-2.6" machine type which also omits the
-<model type='virtio'/> in <interface>, to check if
-qemuDomainDefaultNetModel works too.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1325085
-(cherry picked from commit f06ca25d235433f9139cbfb3d5d9eae7409156b9)
----
- src/qemu/qemu_capabilities.c                       |  3 +-
- src/qemu/qemu_domain.c                             |  3 +-
- ...l2argv-aarch64-virt-2.6-virtio-pci-default.args | 37 +++++++++++++++++
- ...ml2argv-aarch64-virt-2.6-virtio-pci-default.xml | 47 ++++++++++++++++++++++
- tests/qemuxml2argvtest.c                           |  6 +++
- 5 files changed, 94 insertions(+), 2 deletions(-)
- create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.args
- create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.xml
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index 2823843..57e2056 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -2172,7 +2172,8 @@ bool virQEMUCapsHasPCIMultiBus(virQEMUCapsPtr qemuCaps,
-         /* If 'virt' supports PCI, it supports multibus.
-          * No extra conditions here for simplicity.
-          */
--        if (STREQ(def->os.machine, "virt"))
-+        if (STREQ(def->os.machine, "virt") ||
-+            STRPREFIX(def->os.machine, "virt-"))
-             return true;
-     }
- 
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index f38b0f3..d9d5041 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -1479,7 +1479,8 @@ qemuDomainDefaultNetModel(const virDomainDef *def,
-         if (STREQ(def->os.machine, "versatilepb"))
-             return "smc91c111";
- 
--        if (STREQ(def->os.machine, "virt"))
-+        if (STREQ(def->os.machine, "virt") ||
-+            STRPREFIX(def->os.machine, "virt-"))
-             return "virtio";
- 
-         /* Incomplete. vexpress (and a few others) use this, but not all
-diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.args b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.args
-new file mode 100644
-index 0000000..93c181d
---- /dev/null
-+++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.args
-@@ -0,0 +1,37 @@
-+LC_ALL=C \
-+PATH=/bin \
-+HOME=/home/test \
-+USER=test \
-+LOGNAME=test \
-+QEMU_AUDIO_DRV=none \
-+/usr/bin/qemu-system-aarch64 \
-+-name aarch64test \
-+-S \
-+-M virt-2.6 \
-+-cpu cortex-a53 \
-+-m 1024 \
-+-smp 1 \
-+-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
-+-nographic \
-+-nodefconfig \
-+-nodefaults \
-+-monitor unix:/tmp/lib/domain--1-aarch64test/monitor.sock,server,nowait \
-+-boot c \
-+-kernel /aarch64.kernel \
-+-initrd /aarch64.initrd \
-+-append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \
-+-dtb /aarch64.dtb \
-+-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1 \
-+-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x1 \
-+-device virtio-serial-device,id=virtio-serial0 \
-+-usb \
-+-drive file=/aarch64.raw,format=raw,if=none,id=drive-virtio-disk0 \
-+-device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0 \
-+-device virtio-net-device,vlan=0,id=net0,mac=52:54:00:09:a4:37 \
-+-net user,vlan=0,name=hostnet0 \
-+-serial pty \
-+-chardev pty,id=charconsole1 \
-+-device virtconsole,chardev=charconsole1,id=console1 \
-+-device virtio-balloon-device,id=balloon0 \
-+-object rng-random,id=objrng0,filename=/dev/random \
-+-device virtio-rng-device,rng=objrng0,id=rng0
-diff --git a/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.xml b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.xml
-new file mode 100644
-index 0000000..e745101
---- /dev/null
-+++ b/tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.xml
-@@ -0,0 +1,47 @@
-+<domain type="qemu">
-+  <name>aarch64test</name>
-+  <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid>
-+  <memory>1048576</memory>
-+  <currentMemory>1048576</currentMemory>
-+  <vcpu placement='static'>1</vcpu>
-+  <os>
-+    <type arch="aarch64" machine="virt-2.6">hvm</type>
-+    <kernel>/aarch64.kernel</kernel>
-+    <initrd>/aarch64.initrd</initrd>
-+    <dtb>/aarch64.dtb</dtb>
-+    <cmdline>earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait</cmdline>
-+  </os>
-+  <features>
-+    <acpi/>
-+    <apic/>
-+    <pae/>
-+  </features>
-+  <cpu match='exact'>
-+    <model>cortex-a53</model>
-+  </cpu>
-+  <clock offset="utc"/>
-+  <on_poweroff>destroy</on_poweroff>
-+  <on_reboot>restart</on_reboot>
-+  <on_crash>restart</on_crash>
-+  <devices>
-+    <emulator>/usr/bin/qemu-system-aarch64</emulator>
-+    <disk type='file' device='disk'>
-+      <source file='/aarch64.raw'/>
-+      <target dev='vda' bus='virtio'/>
-+    </disk>
-+    <interface type='user'>
-+      <mac address='52:54:00:09:a4:37'/>
-+    </interface>
-+    <console type='pty'/>
-+    <console type='pty'>
-+      <target type='virtio' port='0'/>
-+    </console>
-+    <memballoon model='virtio'/>
-+    <!--
-+      This actually doesn't work in practice because vexpress only has
-+      4 virtio slots available, rng makes 5 -->
-+    <rng model='virtio'>
-+      <backend model='random'>/dev/random</backend>
-+    </rng>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index e9b8d64..d1b9e98 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -1661,6 +1661,12 @@ mymain(void)
-             QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM,
-             QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE,
-             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE);
-+    DO_TEST("aarch64-virt-2.6-virtio-pci-default",
-+            QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DTB,
-+            QEMU_CAPS_DEVICE_VIRTIO_MMIO,
-+            QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM,
-+            QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE,
-+            QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE);
-     /* Example of using virtio-pci with no explicit PCI controller
-        but with manual PCI addresses */
-     DO_TEST("aarch64-virtio-pci-manual-addresses",

0001-util-Fix-logic-in-virFileSetCOW.patch

@@ -0,0 +1,34 @@
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Wed, 5 Aug 2020 10:01:45 +0200
+Subject: [PATCH] util: Fix logic in virFileSetCOW
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When COW is not explicitly requested to be disabled or enabled, the
+function is supposed to do nothing on non-BTRFS file systems.
+
+Fixes commit 7230bc95aa78379c9ee20cf59394c5fc4305b75b.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1866157
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
+(cherry picked from commit 2edd63a0dbd445112db23596ee0128521e8f1ff5)
+---
+ src/util/virfile.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/util/virfile.c b/src/util/virfile.c
+index af150421e7..a06e7dfcce 100644
+--- a/src/util/virfile.c
++++ b/src/util/virfile.c
+@@ -4550,7 +4550,7 @@ virFileSetCOW(const char *path,
+     }
+ 
+     if (buf.f_type != BTRFS_SUPER_MAGIC) {
+-        if (state == VIR_TRISTATE_BOOL_ABSENT) {
++        if (state != VIR_TRISTATE_BOOL_ABSENT) {
+             virReportSystemError(ENOSYS,
+                                  _("unable to control COW flag on '%s', not btrfs"),
+                                  path);

0002-build-cleanup-GCC-4.6-Wlogical-op-workaround.patch

@@ -1,114 +0,0 @@
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Sun, 10 Apr 2016 18:21:13 +0200
-Subject: [PATCH] build: cleanup GCC < 4.6 -Wlogical-op workaround
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 7fb81831fc497aa4a34fdfc036be9c9ae4401084)
----
- m4/virt-compile-warnings.m4 |  2 +-
- src/internal.h              | 10 ++++++++++
- src/util/virbuffer.c        | 11 +++--------
- src/util/virstring.c        |  9 +--------
- src/util/virsysinfo.c       | 13 ++-----------
- 5 files changed, 17 insertions(+), 28 deletions(-)
-
-diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4
-index 3dd0665..1b0a2cf 100644
---- a/m4/virt-compile-warnings.m4
-+++ b/m4/virt-compile-warnings.m4
-@@ -236,7 +236,7 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[
- 
-     if test "$gl_cv_warn_c__Wlogical_op" = yes &&
-        test "$lv_cv_gcc_wlogical_op_broken" = yes; then
--      AC_DEFINE_UNQUOTED([BROKEN_GCC_WLOGICALOP], 1,
-+      AC_DEFINE_UNQUOTED([BROKEN_GCC_WLOGICALOP_STRCHR], 1,
-        [Define to 1 if gcc -Wlogical-op reports false positives on strchr])
-     fi
- ])
-diff --git a/src/internal.h b/src/internal.h
-index db26fb0..35cc6d4 100644
---- a/src/internal.h
-+++ b/src/internal.h
-@@ -253,6 +253,16 @@
- #  define VIR_WARNINGS_RESET
- # endif
- 
-+/* Workaround bogus GCC < 4.6 that produces false -Wlogical-op warnings for
-+ * strchr(). Those old GCCs don't support push/pop. */
-+# if BROKEN_GCC_WLOGICALOP_STRCHR
-+#  define VIR_WARNINGS_NO_WLOGICALOP_STRCHR                \
-+    _Pragma ("GCC diagnostic ignored \"-Wlogical-op\"")
-+# else
-+#  define VIR_WARNINGS_NO_WLOGICALOP_STRCHR
-+# endif
-+
-+
- /*
-  * Use this when passing possibly-NULL strings to printf-a-likes.
-  */
-diff --git a/src/util/virbuffer.c b/src/util/virbuffer.c
-index 43cd1a7..d582e7d 100644
---- a/src/util/virbuffer.c
-+++ b/src/util/virbuffer.c
-@@ -417,14 +417,9 @@ virBufferVasprintf(virBufferPtr buf, const char *format, va_list argptr)
-     buf->use += count;
- }
- 
--/* Work around spurious strchr() diagnostics given by -Wlogical-op
-- * for gcc < 4.6.  Doing it via a local pragma keeps the damage
-- * smaller than disabling it on the package level.  Unfortunately, the
-- * affected GCCs don't allow diagnostic push/pop which would have
-- * further reduced the impact. */
--#if BROKEN_GCC_WLOGICALOP
--# pragma GCC diagnostic ignored "-Wlogical-op"
--#endif
-+
-+VIR_WARNINGS_NO_WLOGICALOP_STRCHR
-+
- 
- /**
-  * virBufferEscapeString:
-diff --git a/src/util/virstring.c b/src/util/virstring.c
-index 7ec42aa..2d7fbf3 100644
---- a/src/util/virstring.c
-+++ b/src/util/virstring.c
-@@ -989,14 +989,7 @@ virStringHasControlChars(const char *str)
- }
- 
- 
--/* Work around spurious strchr() diagnostics given by -Wlogical-op
-- * for gcc < 4.6.  Doing it via a local pragma keeps the damage
-- * smaller than disabling it on the package level.  Unfortunately, the
-- * affected GCCs don't allow diagnostic push/pop which would have
-- * further reduced the impact. */
--#if BROKEN_GCC_WLOGICALOP
--# pragma GCC diagnostic ignored "-Wlogical-op"
--#endif
-+VIR_WARNINGS_NO_WLOGICALOP_STRCHR
- 
- 
- /**
-diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c
-index 05d33a8..e8dbd4d 100644
---- a/src/util/virsysinfo.c
-+++ b/src/util/virsysinfo.c
-@@ -428,17 +428,8 @@ virSysinfoRead(void)
- 
- 
- #elif defined(__s390__) || defined(__s390x__)
--/*
--  we need to ignore warnings about strchr caused by -Wlogical-op
--  for some GCC versions.
--  Doing it via a local pragma keeps the damage smaller than
--  disabling it on the package level.
--  Unfortunately, the affected GCCs don't allow diagnostic push/pop
--  which would have further reduced the impact.
-- */
--# if BROKEN_GCC_WLOGICALOP
--#  pragma GCC diagnostic ignored "-Wlogical-op"
--# endif
-+
-+VIR_WARNINGS_NO_WLOGICALOP_STRCHR
- 
- static char *
- virSysinfoParseDelimited(const char *base, const char *name, char **value,

0002-virdevmapper-Don-t-cache-device-mapper-major.patch

@@ -0,0 +1,88 @@
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Tue, 18 Aug 2020 11:08:15 +0200
+Subject: [PATCH] virdevmapper: Don't cache device-mapper major
+
+The device mapper major is needed in virIsDevMapperDevice() which
+determines whether given device is managed by device-mapper. This
+number is obtained by parsing /proc/devices and then stored in a
+global variable so that the file doesn't have to be parsed again.
+However, as it turns out this logic is flawed - the major number
+is not static and can change as it can be specified as a
+parameter when loading the dm-mod module.
+
+Unfortunately, I was not able to come up with a good solution and
+thus the /proc/devices file is being parsed every time we need
+the device mapper major.
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
+Tested-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
+(cherry picked from commit 82bb167f0d15b733b23931205be3488b83cb9ec6)
+---
+ src/util/virdevmapper.c | 17 +++++------------
+ 1 file changed, 5 insertions(+), 12 deletions(-)
+
+diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c
+index a471504176..b43dbefa9a 100644
+--- a/src/util/virdevmapper.c
++++ b/src/util/virdevmapper.c
+@@ -46,11 +46,9 @@
+ 
+ G_STATIC_ASSERT(BUF_SIZE > sizeof(struct dm_ioctl));
+ 
+-static unsigned int virDMMajor;
+-
+ 
+ static int
+-virDevMapperOnceInit(void)
++virDevMapperGetMajor(unsigned int *major)
+ {
+     g_autofree char *buf = NULL;
+     VIR_AUTOSTRINGLIST lines = NULL;
+@@ -69,7 +67,7 @@ virDevMapperOnceInit(void)
+ 
+         if (sscanf(lines[i], "%u %ms\n", &maj, &dev) == 2 &&
+             STREQ(dev, DM_NAME)) {
+-            virDMMajor = maj;
++            *major = maj;
+             break;
+         }
+     }
+@@ -85,9 +83,6 @@ virDevMapperOnceInit(void)
+ }
+ 
+ 
+-VIR_ONCE_GLOBAL_INIT(virDevMapper);
+-
+-
+ static void *
+ virDMIoctl(int controlFD, int cmd, struct dm_ioctl *dm, char **buf)
+ {
+@@ -305,9 +300,6 @@ virDevMapperGetTargets(const char *path,
+      * consist of devices or yet another targets. If that's the
+      * case, we have to stop recursion somewhere. */
+ 
+-    if (virDevMapperInitialize() < 0)
+-        return -1;
+-
+     if ((controlFD = virDMOpen()) < 0)
+         return -1;
+ 
+@@ -319,13 +311,14 @@ bool
+ virIsDevMapperDevice(const char *dev_name)
+ {
+     struct stat buf;
++    unsigned int major;
+ 
+-    if (virDevMapperInitialize() < 0)
++    if (virDevMapperGetMajor(&major) < 0)
+         return false;
+ 
+     if (!stat(dev_name, &buf) &&
+         S_ISBLK(buf.st_mode) &&
+-        major(buf.st_rdev) == virDMMajor)
++        major(buf.st_rdev) == major)
+         return true;
+ 
+     return false;

0003-build-add-GCC-6.0-Wlogical-op-workaround.patch

@@ -1,172 +0,0 @@
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Sun, 10 Apr 2016 18:22:20 +0200
-Subject: [PATCH] build: add GCC 6.0 -Wlogical-op workaround
-
-fdstream.c: In function 'virFDStreamWrite':
-fdstream.c:390:29: error: logical 'or' of equal expressions [-Werror=logical-op]
-        if (errno == EAGAIN || errno == EWOULDBLOCK) {
-                            ^~
-
-Fedora rawhide now uses gcc 6.0 and there is a bug with -Wlogical-op
-producing false warnings.
-
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69602
-
-Use GCC pragma push/pop and ignore -Wlogical-op for GCC that supports
-push/pop pragma and also has this bug.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit d713a6b120904c488170e7920c482b2fade70ae1)
----
- m4/virt-compile-warnings.m4     | 20 ++++++++++++++++++++
- src/fdstream.c                  |  4 ++++
- src/internal.h                  | 12 ++++++++++++
- src/rpc/virnetsshsession.c      |  6 ++++++
- src/security/security_selinux.c |  2 ++
- 5 files changed, 44 insertions(+)
-
-diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4
-index 1b0a2cf..eb689e2 100644
---- a/m4/virt-compile-warnings.m4
-+++ b/m4/virt-compile-warnings.m4
-@@ -117,6 +117,20 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[
-         [lv_cv_gcc_wlogical_op_broken=yes])
-       CFLAGS="$save_CFLAGS"])
- 
-+    AC_CACHE_CHECK([whether gcc gives bogus warnings for -Wlogical-op],
-+      [lv_cv_gcc_wlogical_op_equal_expr_broken], [
-+        save_CFLAGS="$CFLAGS"
-+        CFLAGS="-O2 -Wlogical-op -Werror"
-+        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-+          #define TEST1 1
-+          #define TEST2 TEST1
-+        ]], [[
-+          int test = 0;
-+          return test == TEST1 || test == TEST2;]])],
-+        [lv_cv_gcc_wlogical_op_equal_expr_broken=no],
-+        [lv_cv_gcc_wlogical_op_equal_expr_broken=yes])
-+        CFLAGS="$save_CFLAGS"])
-+
-     # We might fundamentally need some of these disabled forever, but
-     # ideally we'd turn many of them on
-     dontwarn="$dontwarn -Wfloat-equal"
-@@ -239,4 +253,10 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[
-       AC_DEFINE_UNQUOTED([BROKEN_GCC_WLOGICALOP_STRCHR], 1,
-        [Define to 1 if gcc -Wlogical-op reports false positives on strchr])
-     fi
-+
-+    if test "$gl_cv_warn_c__Wlogical_op" = yes &&
-+       test "$lv_cv_gcc_wlogical_op_equal_expr_broken" = yes; then
-+      AC_DEFINE_UNQUOTED([BROKEN_GCC_WLOGICALOP_EQUAL_EXPR], 1,
-+        [Define to 1 if gcc -Wlogical-op reports false positive 'or' equal expr])
-+    fi
- ])
-diff --git a/src/fdstream.c b/src/fdstream.c
-index a85cf9d..ef118b5 100644
---- a/src/fdstream.c
-+++ b/src/fdstream.c
-@@ -387,7 +387,9 @@ static int virFDStreamWrite(virStreamPtr st, const char *bytes, size_t nbytes)
-  retry:
-     ret = write(fdst->fd, bytes, nbytes);
-     if (ret < 0) {
-+        VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR
-         if (errno == EAGAIN || errno == EWOULDBLOCK) {
-+        VIR_WARNINGS_RESET
-             ret = -2;
-         } else if (errno == EINTR) {
-             goto retry;
-@@ -437,7 +439,9 @@ static int virFDStreamRead(virStreamPtr st, char *bytes, size_t nbytes)
-  retry:
-     ret = read(fdst->fd, bytes, nbytes);
-     if (ret < 0) {
-+        VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR
-         if (errno == EAGAIN || errno == EWOULDBLOCK) {
-+        VIR_WARNINGS_RESET
-             ret = -2;
-         } else if (errno == EINTR) {
-             goto retry;
-diff --git a/src/internal.h b/src/internal.h
-index 35cc6d4..926e990 100644
---- a/src/internal.h
-+++ b/src/internal.h
-@@ -245,11 +245,23 @@
-     _Pragma ("GCC diagnostic push")
- #  endif
- 
-+/* Workaround bogus GCC 6.0 for logical 'or' equal expression warnings.
-+ * (GCC bz 69602) */
-+#  if BROKEN_GCC_WLOGICALOP_EQUAL_EXPR
-+#   define VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR            \
-+     _Pragma ("GCC diagnostic push")                        \
-+     _Pragma ("GCC diagnostic ignored \"-Wlogical-op\"")
-+#  else
-+#   define VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR            \
-+     _Pragma ("GCC diagnostic push")
-+#  endif
-+
- #  define VIR_WARNINGS_RESET \
-     _Pragma ("GCC diagnostic pop")
- # else
- #  define VIR_WARNINGS_NO_CAST_ALIGN
- #  define VIR_WARNINGS_NO_PRINTF
-+#  define VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR
- #  define VIR_WARNINGS_RESET
- # endif
- 
-diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c
-index 406a831..e742175 100644
---- a/src/rpc/virnetsshsession.c
-+++ b/src/rpc/virnetsshsession.c
-@@ -545,9 +545,11 @@ virNetSSHAuthenticateAgent(virNetSSHSessionPtr sess,
-                                            agent_identity)))
-             return 0; /* key accepted */
- 
-+        VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR
-         if (ret != LIBSSH2_ERROR_AUTHENTICATION_FAILED &&
-             ret != LIBSSH2_ERROR_PUBLICKEY_UNRECOGNIZED &&
-             ret != LIBSSH2_ERROR_PUBLICKEY_UNVERIFIED) {
-+        VIR_WARNINGS_RESET
-             libssh2_session_last_error(sess->session, &errmsg, NULL, 0);
-             virReportError(VIR_ERR_AUTH_FAILED,
-                            _("failed to authenticate using SSH agent: %s"),
-@@ -605,9 +607,11 @@ virNetSSHAuthenticatePrivkey(virNetSSHSessionPtr sess,
-                                                    priv->password)) == 0)
-         return 0; /* success */
- 
-+    VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR
-     if (priv->password ||
-         ret == LIBSSH2_ERROR_PUBLICKEY_UNRECOGNIZED ||
-         ret == LIBSSH2_ERROR_AUTHENTICATION_FAILED) {
-+    VIR_WARNINGS_RESET
-         libssh2_session_last_error(sess->session, &errmsg, NULL, 0);
-         virReportError(VIR_ERR_AUTH_FAILED,
-                        _("authentication with private key '%s' "
-@@ -673,11 +677,13 @@ virNetSSHAuthenticatePrivkey(virNetSSHSessionPtr sess,
-                          "has failed: %s"),
-                        priv->filename, errmsg);
- 
-+        VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR
-         if (ret == LIBSSH2_ERROR_PUBLICKEY_UNRECOGNIZED ||
-             ret == LIBSSH2_ERROR_AUTHENTICATION_FAILED)
-             return 1;
-         else
-             return -1;
-+        VIR_WARNINGS_RESET
-     }
- 
-     return 0;
-diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
-index 26d95d1..04760a1 100644
---- a/src/security/security_selinux.c
-+++ b/src/security/security_selinux.c
-@@ -911,8 +911,10 @@ virSecuritySELinuxSetFileconHelper(const char *path, char *tcon,
-          * hopefully sets one of the necessary SELinux virt_use_{nfs,usb,pci}
-          * boolean tunables to allow it ...
-          */
-+        VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR
-         if (setfilecon_errno != EOPNOTSUPP && setfilecon_errno != ENOTSUP &&
-             setfilecon_errno != EROFS) {
-+        VIR_WARNINGS_RESET
-             virReportSystemError(setfilecon_errno,
-                                  _("unable to set security context '%s' on '%s'"),
-                                  tcon, path);

0003-virdevmapper-Handle-kernel-without-device-mapper-sup.patch

@@ -0,0 +1,76 @@
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Tue, 18 Aug 2020 11:04:24 +0200
+Subject: [PATCH] virdevmapper: Handle kernel without device-mapper support
+
+In one of my latest patch (v6.6.0~30) I was trying to remove
+libdevmapper use in favor of our own implementation. However, the
+code did not take into account that device mapper can be not
+compiled into the kernel (e.g. be a separate module that's not
+loaded) in which case /proc/devices won't have the device-mapper
+major number and thus virDevMapperGetTargets() and/or
+virIsDevMapperDevice() fails.
+
+However, such failure is safe to ignore, because if device mapper
+is missing then there can't be any multipath devices and thus we
+don't need to allow the deps in CGroups, nor create them in the
+domain private namespace, etc.
+
+Fixes: 22494556542c676d1b9e7f1c1f2ea13ac17e1e3e
+Reported-by: Andrea Bolognani <abologna@redhat.com>
+Reported-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
+Reviewed-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
+Tested-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
+(cherry picked from commit feb8564a3cc63bc8f68284063d53ec0d2d81a1cc)
+---
+ src/util/virdevmapper.c | 20 ++++++++++++++++++--
+ 1 file changed, 18 insertions(+), 2 deletions(-)
+
+diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c
+index b43dbefa9a..a81e2edee4 100644
+--- a/src/util/virdevmapper.c
++++ b/src/util/virdevmapper.c
+@@ -54,6 +54,9 @@ virDevMapperGetMajor(unsigned int *major)
+     VIR_AUTOSTRINGLIST lines = NULL;
+     size_t i;
+ 
++    if (!virFileExists(CONTROL_PATH))
++        return -2;
++
+     if (virFileReadAll(PROC_DEVICES, BUF_SIZE, &buf) < 0)
+         return -1;
+ 
+@@ -126,8 +129,13 @@ virDMOpen(void)
+ 
+     memset(&dm, 0, sizeof(dm));
+ 
+-    if ((controlFD = open(CONTROL_PATH, O_RDWR)) < 0)
++    if ((controlFD = open(CONTROL_PATH, O_RDWR)) < 0) {
++        if (errno == ENOENT)
++            return -2;
++
++        virReportSystemError(errno, _("Unable to open %s"), CONTROL_PATH);
+         return -1;
++    }
+ 
+     if (!virDMIoctl(controlFD, DM_VERSION, &dm, &tmp)) {
+         virReportSystemError(errno, "%s",
+@@ -300,8 +308,16 @@ virDevMapperGetTargets(const char *path,
+      * consist of devices or yet another targets. If that's the
+      * case, we have to stop recursion somewhere. */
+ 
+-    if ((controlFD = virDMOpen()) < 0)
++    if ((controlFD = virDMOpen()) < 0) {
++        if (controlFD == -2) {
++            /* The CONTROL_PATH doesn't exist. Probably the
++             * module isn't loaded, yet. Don't error out, just
++             * exit. */
++            return 0;
++        }
++
+         return -1;
++    }
+ 
+     return virDevMapperGetTargetsImpl(controlFD, path, devPaths, ttl);
+ }

0004-virdevmapper-Ignore-all-errors-when-opening-dev-mapp.patch

@@ -0,0 +1,77 @@
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Wed, 19 Aug 2020 13:35:55 +0200
+Subject: [PATCH] virdevmapper: Ignore all errors when opening
+ /dev/mapper/control
+
+So far, only ENOENT is ignored (to deal with kernels without
+devmapper). However, as reported on the list, under certain
+scenarios a different error can occur. For instance, when libvirt
+is running inside a container which doesn't have permissions to
+talk to the devmapper. If this is the case, then open() returns
+-1 and sets errno=EPERM.
+
+Assuming that multipath devices are fairly narrow use case and
+using them in a restricted container is even more narrow the best
+fix seems to be to ignore all open errors BUT produce a warning
+on failure. To avoid flooding logs with warnings on kernels
+without devmapper the level is reduced to a plain debug message.
+
+Reported-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
+Reviewed-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+(cherry picked from commit 53d9af1e7924757e3b5f661131dd707d7110d094)
+---
+ src/util/virdevmapper.c | 23 +++++++++++++++--------
+ 1 file changed, 15 insertions(+), 8 deletions(-)
+
+diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c
+index a81e2edee4..ee2fab5ae3 100644
+--- a/src/util/virdevmapper.c
++++ b/src/util/virdevmapper.c
+@@ -35,9 +35,12 @@
+ # include "viralloc.h"
+ # include "virstring.h"
+ # include "virfile.h"
++# include "virlog.h"
+ 
+ # define VIR_FROM_THIS VIR_FROM_STORAGE
+ 
++VIR_LOG_INIT("util.virdevmapper");
++
+ # define PROC_DEVICES "/proc/devices"
+ # define DM_NAME "device-mapper"
+ # define DEV_DM_DIR "/dev/" DM_DIR
+@@ -130,11 +133,15 @@ virDMOpen(void)
+     memset(&dm, 0, sizeof(dm));
+ 
+     if ((controlFD = open(CONTROL_PATH, O_RDWR)) < 0) {
+-        if (errno == ENOENT)
+-            return -2;
+-
+-        virReportSystemError(errno, _("Unable to open %s"), CONTROL_PATH);
+-        return -1;
++        /* We can't talk to devmapper. Produce a warning and let
++         * the caller decide what to do next. */
++        if (errno == ENOENT) {
++            VIR_DEBUG("device mapper not available");
++        } else {
++            VIR_WARN("unable to open %s: %s",
++                     CONTROL_PATH, g_strerror(errno));
++        }
++        return -2;
+     }
+ 
+     if (!virDMIoctl(controlFD, DM_VERSION, &dm, &tmp)) {
+@@ -310,9 +317,9 @@ virDevMapperGetTargets(const char *path,
+ 
+     if ((controlFD = virDMOpen()) < 0) {
+         if (controlFD == -2) {
+-            /* The CONTROL_PATH doesn't exist. Probably the
+-             * module isn't loaded, yet. Don't error out, just
+-             * exit. */
++            /* The CONTROL_PATH doesn't exist or is unusable.
++             * Probably the module isn't loaded, yet. Don't error
++             * out, just exit. */
+             return 0;
+         }
+ 

0005-util-use-g_autofree-in-virSCSIHostGetUniqueId.patch

@@ -0,0 +1,57 @@
+From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
+Date: Wed, 4 Nov 2020 12:08:19 +0100
+Subject: [PATCH] util: use g_autofree in virSCSIHostGetUniqueId
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Erik Skultety <eskultet@redhat.com>
+(cherry picked from commit 843b70995471c1a20822ee62ff084310066b4b4a)
+---
+ src/util/virscsihost.c | 16 +++++-----------
+ 1 file changed, 5 insertions(+), 11 deletions(-)
+
+diff --git a/src/util/virscsihost.c b/src/util/virscsihost.c
+index 7d8e5299b8..4e6d8f7ad6 100644
+--- a/src/util/virscsihost.c
++++ b/src/util/virscsihost.c
+@@ -46,17 +46,16 @@ int
+ virSCSIHostGetUniqueId(const char *sysfs_prefix,
+                        int host)
+ {
+-    char *sysfs_path = NULL;
++    g_autofree char *sysfs_path = NULL;
+     char *p = NULL;
+-    int ret = -1;
+-    char *buf = NULL;
++    g_autofree char *buf = NULL;
+     int unique_id;
+ 
+     sysfs_path = g_strdup_printf("%s/host%d/unique_id",
+                                  sysfs_prefix ? sysfs_prefix : SYSFS_SCSI_HOST_PATH, host);
+ 
+     if (virFileReadAll(sysfs_path, 1024, &buf) < 0)
+-        goto cleanup;
++        return -1;
+ 
+     if ((p = strchr(buf, '\n')))
+         *p = '\0';
+@@ -65,15 +64,10 @@ virSCSIHostGetUniqueId(const char *sysfs_prefix,
+         virReportError(VIR_ERR_INTERNAL_ERROR,
+                        _("unable to parse unique_id: %s"), buf);
+ 
+-        goto cleanup;
++        return -1;
+     }
+ 
+-    ret = unique_id;
+-
+- cleanup:
+-    VIR_FREE(sysfs_path);
+-    VIR_FREE(buf);
+-    return ret;
++    return unique_id;
+ }
+ 
+ 

0006-util-quieten-virSCSIHostGetUniqueId.patch

@@ -0,0 +1,56 @@
+From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
+Date: Wed, 4 Nov 2020 12:29:07 +0100
+Subject: [PATCH] util: quieten virSCSIHostGetUniqueId
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The only caller of this function ignores failure
+and just sets the unique_id to -1.
+
+Failing to read the file is likely to the device no longer
+being present, not a real error.
+
+Stop reporting errors in this function.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1692100
+
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Erik Skultety <eskultet@redhat.com>
+(cherry picked from commit 4a56278e770c972dbee7be5842b557de152a586e)
+---
+ src/util/virscsihost.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/util/virscsihost.c b/src/util/virscsihost.c
+index 4e6d8f7ad6..b1d51b40d3 100644
+--- a/src/util/virscsihost.c
++++ b/src/util/virscsihost.c
+@@ -41,6 +41,8 @@ VIR_LOG_INIT("util.scsi_host");
+  * Read the value of the "scsi_host" unique_id file.
+  *
+  * Returns the value on success or -1 on failure.
++ *
++ * No errors are reported.
+  */
+ int
+ virSCSIHostGetUniqueId(const char *sysfs_prefix,
+@@ -54,16 +56,14 @@ virSCSIHostGetUniqueId(const char *sysfs_prefix,
+     sysfs_path = g_strdup_printf("%s/host%d/unique_id",
+                                  sysfs_prefix ? sysfs_prefix : SYSFS_SCSI_HOST_PATH, host);
+ 
+-    if (virFileReadAll(sysfs_path, 1024, &buf) < 0)
++    if (virFileReadAllQuiet(sysfs_path, 1024, &buf) < 0)
+         return -1;
+ 
+     if ((p = strchr(buf, '\n')))
+         *p = '\0';
+ 
+     if (virStrToLong_i(buf, NULL, 10, &unique_id) < 0) {
+-        virReportError(VIR_ERR_INTERNAL_ERROR,
+-                       _("unable to parse unique_id: %s"), buf);
+-
++        VIR_DEBUG("unable to parse unique_id: '%s'", buf);
+         return -1;
+     }
+ 

0007-node_device-Use-udev-monitor-source.patch

@@ -0,0 +1,46 @@
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Tue, 17 Nov 2020 12:56:39 +0100
+Subject: [PATCH] node_device: Use "udev" monitor source
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+In v6.3.0-rc1~67 I've made a switch: instead of listening on udev
+events the nodedev driver started listening for kernel events.
+This was because when a device changes its name (e.g. NICs) we
+will get "move" event with DEVPATH_OLD property set, which we can
+then use to remove the old device and thus keep our internal list
+up to date. The switch to "kernel" source was made because if the
+old NICs naming (eth0, eth1, ...) is enabled (e.g. via
+net.ifnames=0 on the kernel cmd line) then udev overwrites the
+property with the new name making our internal list go out of
+sync. Interestingly, when the od NICs naming is not enabled then
+the DEVPATH_OLD contains the correct value.
+
+But as it turns out, "kernel" source might be missing some other
+important properties, e.g. USB vendor/product IDs. Therefore,
+switch back to "udev" source and wish the best of luck to users
+using the old NICs naming.
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1897625
+Fixes: 9a13704818e4a018723e0ec5b9e97b176f1c8584
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
+(cherry picked from commit 7e67a136dab9034dd3cb2ed76fa90c524c800cde)
+---
+ src/node_device/node_device_udev.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
+index ff558efb83..b7fbd42fa1 100644
+--- a/src/node_device/node_device_udev.c
++++ b/src/node_device/node_device_udev.c
+@@ -1878,7 +1878,7 @@ nodeStateInitialize(bool privileged,
+ 
+     virObjectLock(priv);
+ 
+-    priv->udev_monitor = udev_monitor_new_from_netlink(udev, "kernel");
++    priv->udev_monitor = udev_monitor_new_from_netlink(udev, "udev");
+     if (!priv->udev_monitor) {
+         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                        _("udev_monitor_new_from_netlink returned NULL"));

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: libvirt
-# $Id$
-NAME := libvirt
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

sources

@@ -1 +1 @@
-698e0949a41a2b669dbe374759aaa64b  libvirt-1.3.3.tar.gz
+SHA512 (libvirt-6.6.0.tar.xz) = 55091addcf43d3c0bdd50f9378b588351181d191272d5a19220a0babe0893c1f6e0f1e41a7f51b8c1fb8e2098236b273e1a18b81573f4008ee3cf65374ba9465