Fix mistakes in post scripts causing uninstall errors

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

0001-qemu-xen-add-missing-deps-on-virtlockd-virtlogd-sock.patch

@@ -0,0 +1,66 @@
+From 88c5b9f827779ae6fe5a6f08100a4b6184492a1c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Tue, 31 Aug 2021 10:59:39 +0100
+Subject: [PATCH] qemu, xen: add missing deps on virtlockd/virtlogd sockets
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The QEMU driver uses both virtlogd and virtlockd, while the Xen driver
+uses virtlockd. The libvirtd.service unit contains deps on the socket
+units for these services, but these deps were missed in the modular
+daemons. As a result the virtlockd/virtlogd sockets are not started
+when the virtqemud/virtxend daemons are started.
+
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
+---
+ src/libxl/virtxend.service.in | 2 ++
+ src/qemu/virtqemud.service.in | 4 ++++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/src/libxl/virtxend.service.in b/src/libxl/virtxend.service.in
+index a863917467..19b19ce3e6 100644
+--- a/src/libxl/virtxend.service.in
++++ b/src/libxl/virtxend.service.in
+@@ -1,6 +1,7 @@
+ [Unit]
+ Description=Virtualization xen daemon
+ Conflicts=libvirtd.service
++Requires=virtlockd.socket
+ Requires=virtxend.socket
+ Requires=virtxend-ro.socket
+ Requires=virtxend-admin.socket
+@@ -25,6 +26,7 @@ KillMode=process
+ 
+ [Install]
+ WantedBy=multi-user.target
++Also=virtlockd.socket
+ Also=virtxend.socket
+ Also=virtxend-ro.socket
+ Also=virtxend-admin.socket
+diff --git a/src/qemu/virtqemud.service.in b/src/qemu/virtqemud.service.in
+index 8abc9d3a7f..20e1b43a6e 100644
+--- a/src/qemu/virtqemud.service.in
++++ b/src/qemu/virtqemud.service.in
+@@ -1,6 +1,8 @@
+ [Unit]
+ Description=Virtualization qemu daemon
+ Conflicts=libvirtd.service
++Requires=virtlogd.socket
++Requires=virtlockd.socket
+ Requires=virtqemud.socket
+ Requires=virtqemud-ro.socket
+ Requires=virtqemud-admin.socket
+@@ -42,6 +44,8 @@ LimitMEMLOCK=64M
+ 
+ [Install]
+ WantedBy=multi-user.target
++Also=virtlogd.socket
++Also=virtlockd.socket
+ Also=virtqemud.socket
+ Also=virtqemud-ro.socket
+ Also=virtqemud-admin.socket
+-- 
+2.31.1
+

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

@@ -1,34 +0,0 @@
-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-virdevmapper-Don-t-cache-device-mapper-major.patch

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

0002-wireshark-Switch-to-tvb_bytes_to_str.patch

@@ -0,0 +1,81 @@
+From 7e299ba649b1288d529c7595c0e6060c9ae0ff2a Mon Sep 17 00:00:00 2001
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Mon, 29 Nov 2021 09:57:49 +0100
+Subject: [PATCH 1/2] wireshark: Switch to tvb_bytes_to_str()
+
+When the dissector sees a byte sequence that is either an opaque
+data (xdr_opaque) or a byte sequence (xdr_bytes) it formats the
+bytes as a hex numbers using our own implementation. But
+wireshark already provides a function for it: tvb_bytes_to_str().
+NB, the reason why it returns a const string is so that callers
+don't try to free it - the string is allocated using an allocator
+which will decide when to free it.
+
+The wireshark formatter was introduced in wireshark commit of
+v1.99.2~479 and thus is present in the version we require at
+least (2.6.0).
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ tools/wireshark/src/packet-libvirt.c | 30 ++++++++--------------------
+ 1 file changed, 8 insertions(+), 22 deletions(-)
+
+diff --git a/tools/wireshark/src/packet-libvirt.c b/tools/wireshark/src/packet-libvirt.c
+index f43919b05d..cb922b8070 100644
+--- a/tools/wireshark/src/packet-libvirt.c
++++ b/tools/wireshark/src/packet-libvirt.c
+@@ -158,24 +158,6 @@ dissect_xdr_string(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf,
+     }
+ }
+ 
+-static const gchar *
+-format_xdr_bytes(guint8 *bytes, guint32 length)
+-{
+-    gchar *buf;
+-    guint32 i;
+-
+-    if (length == 0)
+-        return "";
+-    buf = wmem_alloc(wmem_packet_scope(), length*2 + 1);
+-    for (i = 0; i < length; i++) {
+-        /* We know that buf has enough size to contain
+-           2 * length + '\0' characters. */
+-        g_snprintf(buf, 2*(length - i) + 1, "%02x", bytes[i]);
+-        buf += 2;
+-    }
+-    return buf - length*2;
+-}
+-
+ static gboolean
+ dissect_xdr_opaque(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf,
+                    guint32 size)
+@@ -187,8 +169,10 @@ dissect_xdr_opaque(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf,
+     val = g_malloc(size);
+     start = xdr_getpos(xdrs);
+     if ((rc = xdr_opaque(xdrs, (caddr_t)val, size))) {
+-        proto_tree_add_bytes_format_value(tree, hf, tvb, start, xdr_getpos(xdrs) - start,
+-                                          NULL, "%s", format_xdr_bytes(val, size));
++        gint len = xdr_getpos(xdrs) - start;
++        const char *s = tvb_bytes_to_str(wmem_packet_scope(), tvb, start, len);
++
++        proto_tree_add_bytes_format_value(tree, hf, tvb, start, len, NULL, "%s", s);
+     } else {
+         proto_tree_add_item(tree, hf_libvirt_unknown, tvb, start, -1, ENC_NA);
+     }
+@@ -207,8 +191,10 @@ dissect_xdr_bytes(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf,
+ 
+     start = xdr_getpos(xdrs);
+     if (xdr_bytes(xdrs, (char **)&val, &length, maxlen)) {
+-        proto_tree_add_bytes_format_value(tree, hf, tvb, start, xdr_getpos(xdrs) - start,
+-                                          NULL, "%s", format_xdr_bytes(val, length));
++        gint len = xdr_getpos(xdrs) - start;
++        const char *s = tvb_bytes_to_str(wmem_packet_scope(), tvb, start, len);
++
++        proto_tree_add_bytes_format_value(tree, hf, tvb, start, len, NULL, "%s", s);
+         /* Seems I can't call xdr_free() for this case.
+            It will raises SEGV by referencing out of bounds call stack */
+         free(val);
+-- 
+2.33.1
+

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

@@ -1,76 +0,0 @@
-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);
- }

0003-wireshark-Drop-needless-comment-in-dissect_xdr_bytes.patch

@@ -0,0 +1,33 @@
+From 010613cfd8dae6d85602a84c5c95b2d441e1b3d1 Mon Sep 17 00:00:00 2001
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Mon, 29 Nov 2021 10:20:05 +0100
+Subject: [PATCH 2/2] wireshark: Drop needless comment in dissect_xdr_bytes()
+
+In the dissect_xdr_bytes() there's a comment that the string
+allocated by xdr_bytes() can't be freed using xdr_free(). Well,
+that is expected because xdr_bytes() used plain calloc() AND the
+string is not an XDR struct but plain 'char *' type. Passing it
+to xdr_free() must result in weird things happening.
+
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+---
+ tools/wireshark/src/packet-libvirt.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/tools/wireshark/src/packet-libvirt.c b/tools/wireshark/src/packet-libvirt.c
+index cb922b8070..eeacbcdf0e 100644
+--- a/tools/wireshark/src/packet-libvirt.c
++++ b/tools/wireshark/src/packet-libvirt.c
+@@ -195,8 +195,6 @@ dissect_xdr_bytes(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, int hf,
+         const char *s = tvb_bytes_to_str(wmem_packet_scope(), tvb, start, len);
+ 
+         proto_tree_add_bytes_format_value(tree, hf, tvb, start, len, NULL, "%s", s);
+-        /* Seems I can't call xdr_free() for this case.
+-           It will raises SEGV by referencing out of bounds call stack */
+         free(val);
+         return TRUE;
+     } else {
+-- 
+2.33.1
+

0004-tests-virstoragetest-remove-tests-without-backing-ty.patch

@@ -0,0 +1,78 @@
+From 979d1ba3ae1332bda80cb6eca98e41dc4462a226 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
+Date: Tue, 31 Aug 2021 11:41:55 +0200
+Subject: [PATCH] tests: virstoragetest: remove tests without backing type
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+As of qemu commit:
+
+  commit 497a30dbb065937d67f6c43af6dd78492e1d6f6d
+    qemu-img: Require -F with -b backing image
+
+creating images with backing images requires specifying the format.
+
+Remove tests which do not pass the backing format on the command
+line.
+
+Signed-off-by: Ján Tomko <jtomko@redhat.com>
+Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
+---
+ tests/virstoragetest.c | 33 ---------------------------------
+ 1 file changed, 33 deletions(-)
+
+diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
+index 1b211b60e6..b80818bc7b 100644
+--- a/tests/virstoragetest.c
++++ b/tests/virstoragetest.c
+@@ -638,30 +638,6 @@ mymain(void)
+     };
+     TEST_CHAIN(abswrap, VIR_STORAGE_FILE_QCOW2, (&wrap, &qcow2, &raw), EXP_PASS);
+ 
+-    /* Rewrite qcow2 and wrap file to omit backing file type */
+-    virCommandFree(cmd);
+-    cmd = virCommandNewArgList(qemuimg, "rebase", "-u", "-f", "qcow2",
+-                               "-b", absraw, "qcow2", NULL);
+-    if (virCommandRun(cmd, NULL) < 0)
+-        ret = -1;
+-
+-    virCommandFree(cmd);
+-    cmd = virCommandNewArgList(qemuimg, "rebase", "-u", "-f", "qcow2",
+-                               "-b", absqcow2, "wrap", NULL);
+-    if (virCommandRun(cmd, NULL) < 0)
+-        ret = -1;
+-
+-    /* Qcow2 file with raw as absolute backing, backing format omitted */
+-    testFileData wrap_as_raw = {
+-        .expBackingStoreRaw = absqcow2,
+-        .expCapacity = 1024,
+-        .path = abswrap,
+-        .type = VIR_STORAGE_TYPE_FILE,
+-        .format = VIR_STORAGE_FILE_QCOW2,
+-    };
+-    TEST_CHAIN(abswrap, VIR_STORAGE_FILE_QCOW2,
+-               (&wrap_as_raw, &qcow2_as_raw), EXP_FAIL);
+-
+     /* Rewrite qcow2 to a missing backing file, with backing type */
+     virCommandFree(cmd);
+     cmd = virCommandNewArgList(qemuimg, "rebase", "-u", "-f", "qcow2",
+@@ -674,15 +650,6 @@ mymain(void)
+     /* Qcow2 file with missing backing file but specified type */
+     TEST_CHAIN(absqcow2, VIR_STORAGE_FILE_QCOW2, (&qcow2), EXP_FAIL);
+ 
+-    /* Rewrite qcow2 to a missing backing file, without backing type */
+-    virCommandFree(cmd);
+-    cmd = virCommandNewArgList(qemuimg, "rebase", "-u", "-f", "qcow2",
+-                               "-b", datadir "/bogus", "qcow2", NULL);
+-    if (virCommandRun(cmd, NULL) < 0)
+-        ret = -1;
+-
+-    /* Qcow2 file with missing backing file and no specified type */
+-    TEST_CHAIN(absqcow2, VIR_STORAGE_FILE_QCOW2, (&qcow2), EXP_FAIL);
+ 
+     /* Rewrite qcow2 to use an nbd: protocol as backend */
+     virCommandFree(cmd);
+-- 
+2.33.1
+

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

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

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

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

@@ -1,46 +0,0 @@
-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"));

sources

@@ -1 +1 @@
-SHA512 (libvirt-6.6.0.tar.xz) = 55091addcf43d3c0bdd50f9378b588351181d191272d5a19220a0babe0893c1f6e0f1e41a7f51b8c1fb8e2098236b273e1a18b81573f4008ee3cf65374ba9465
+SHA512 (libvirt-7.6.0.tar.xz) = bad6cc02af071ca909bbbe3c07165e91cad863c9a759b26d9cff6aed6ea5643bc723d2f3c61ad41436dffd4fd50389333d74b131e37eaa54a5071a3ae26df627