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)

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);

0001-virDomainDiskTranslateSourcePool-Check-for-disk-type.patch

@@ -1,36 +0,0 @@
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Mon, 9 Mar 2020 16:40:57 +0100
-Subject: [PATCH] virDomainDiskTranslateSourcePool: Check for disk type
- correctly
-
-When rewriting the virDomainDiskTranslateSourcePool() function in
-v6.1.0-rc1~184 a typo was introduced. Previously, we allowed
-startup policy only for those volumes which translated to
-VIR_STORAGE_TYPE_FILE. But starting with the referenced commit,
-the value we checked for was changed to VIR_STORAGE_VOL_FILE
-which comes from a different enum and has a different value too.
-This is wrong, because virStorageSourceGetActualType() returns a
-value from the original enum.
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1811728
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-(cherry picked from commit 3918dbd84e4951b43f93fbf50ef52be00274850c)
----
- src/conf/domain_conf.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 17867eeece..fd2e8f4eb5 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -31746,7 +31746,7 @@ virDomainDiskTranslateSourcePool(virDomainDiskDefPtr def)
-     }
- 
-     if (def->startupPolicy != 0 &&
--        virStorageSourceGetActualType(def->src) != VIR_STORAGE_VOL_FILE) {
-+        virStorageSourceGetActualType(def->src) != VIR_STORAGE_TYPE_FILE) {
-         virReportError(VIR_ERR_XML_ERROR, "%s",
-                        _("'startupPolicy' is only valid for "
-                          "'file' type volume"));

0002-network-make-it-safe-to-call-networkSetupPrivateChai.patch

@@ -1,55 +0,0 @@
-From: Laine Stump <laine@redhat.com>
-Date: Thu, 7 May 2020 22:32:59 -0400
-Subject: [PATCH] network: make it safe to call networkSetupPrivateChains()
- multiple times
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-networkSetupPrivateChains() is currently called only once per run of
-libvirtd, so it can assume that errInitV4 and errInitV6 are empty/null
-when it is called. In preparation for potentially calling this
-function multiple times during one run, this patch moves the reset of
-errInitV[46] to the top of the function, to assure no memory is
-leaked.
-
-Signed-off-by: Laine Stump <laine@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit de110f110fb917a31b9f33ad8e4b3c1d3284766a)
----
- src/network/bridge_driver_linux.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/network/bridge_driver_linux.c b/src/network/bridge_driver_linux.c
-index 7bbde5c6a9..80bd2409e1 100644
---- a/src/network/bridge_driver_linux.c
-+++ b/src/network/bridge_driver_linux.c
-@@ -48,6 +48,10 @@ static void networkSetupPrivateChains(void)
-     VIR_DEBUG("Setting up global firewall chains");
- 
-     createdChains = false;
-+    virFreeError(errInitV4);
-+    errInitV4 = NULL;
-+    virFreeError(errInitV6);
-+    errInitV6 = NULL;
- 
-     rc = iptablesSetupPrivateChains(VIR_FIREWALL_LAYER_IPV4);
-     if (rc < 0) {
-@@ -56,8 +60,6 @@ static void networkSetupPrivateChains(void)
-         errInitV4 = virSaveLastError();
-         virResetLastError();
-     } else {
--        virFreeError(errInitV4);
--        errInitV4 = NULL;
-         if (rc) {
-             VIR_DEBUG("Created global IPv4 chains");
-             createdChains = true;
-@@ -73,8 +75,6 @@ static void networkSetupPrivateChains(void)
-         errInitV6 = virSaveLastError();
-         virResetLastError();
-     } else {
--        virFreeError(errInitV6);
--        errInitV6 = NULL;
-         if (rc) {
-             VIR_DEBUG("Created global IPv6 chains");
-             createdChains = true;

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-network-force-re-creation-of-iptables-private-chains.patch

@@ -1,265 +0,0 @@
-From: Laine Stump <laine@redhat.com>
-Date: Thu, 7 May 2020 21:54:39 -0400
-Subject: [PATCH] network: force re-creation of iptables private chains on
- firewalld restart
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When firewalld is stopped, it removes *all* iptables rules and chains,
-including those added by libvirt. Since restarting firewalld means
-stopping and then starting it, any time it is restarted, libvirt needs
-to recreate all the private iptables chains it uses, along with all
-the rules it adds.
-
-We already have code in place to call networkReloadFirewallRules() any
-time we're notified of a firewalld start, and
-networkReloadFirewallRules() will call
-networkPreReloadFirewallRules(), which calls
-networkSetupPrivateChains(); unfortunately that last call is called
-using virOnce(), meaning that it will only be called the first time
-through networkPreReloadFirewallRules() after libvirtd starts - so of
-course when firewalld is later restarted, the call to
-networkSetupPrivateChains() is skipped.
-
-The neat and tidy way to fix this would be if there was a standard way
-to reset a pthread_once_t object so that the next time virOnce was
-called, it would think the function hadn't been called, and call it
-again. Unfortunately, there isn't any official way of doing that (we
-*could* just fill it with 0 and hope for the best, but that doesn't
-seem very safe.
-
-So instead, this patch just adds a static variable called
-chainInitDone, which is set to true after networkSetupPrivateChains()
-is called for the first time, and then during calls to
-networkPreReloadFirewallRules(), if chainInitDone is set, we call
-networkSetupPrivateChains() directly instead of via virOnce().
-
-It may seem unsafe to directly call a function that is meant to be
-called only once, but I think in this case we're safe - there's
-nothing in the function that is inherently "once only" - it doesn't
-initialize anything that can't safely be re-initialized (as long as
-two threads don't try to do it at the same time), and it only happens
-when responding to a dbus message that firewalld has been started (and
-I don't think it's possible for us to be processing two of those at
-once), and even then only if the initial call to the function has
-already been completed (so we're safe if we receive a firewalld
-restart call at a time when we haven't yet called it, or even if
-another thread is already in the process of executing it. The only
-problematic bit I can think of is if another thread is in the process
-of adding an iptable rule at the time we're executing this function,
-but 1) none of those threads will be trying to add chains, and 2) if
-there was a concurrency problem with other threads adding iptables
-rules while firewalld was being restarted, it would still be a problem
-even without this change.
-
-This is yet another patch that fixes an occurrence of this error:
-
-COMMAND_FAILED: '/usr/sbin/iptables -w10 -w --table filter --insert LIBVIRT_INP --in-interface virbr0 --protocol tcp --destination-port 67 --jump ACCEPT' failed: iptables: No chain/target/match by that name.
-
-In particular, this resolves: https://bugzilla.redhat.com/1813830
-
-Signed-off-by: Laine Stump <laine@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit f5418b427e7d2f26803880309478de9103680826)
----
- src/network/bridge_driver.c          | 16 ++++---
- src/network/bridge_driver_linux.c    | 69 ++++++++++++++++++----------
- src/network/bridge_driver_nop.c      |  3 +-
- src/network/bridge_driver_platform.h |  2 +-
- 4 files changed, 58 insertions(+), 32 deletions(-)
-
-diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
-index 369e80a889..aaf14defe4 100644
---- a/src/network/bridge_driver.c
-+++ b/src/network/bridge_driver.c
-@@ -273,7 +273,9 @@ static int
- networkShutdownNetworkExternal(virNetworkObjPtr obj);
- 
- static void
--networkReloadFirewallRules(virNetworkDriverStatePtr driver, bool startup);
-+networkReloadFirewallRules(virNetworkDriverStatePtr driver,
-+                           bool startup,
-+                           bool force);
- 
- static void
- networkRefreshDaemons(virNetworkDriverStatePtr driver);
-@@ -689,7 +691,7 @@ firewalld_dbus_filter_bridge(DBusConnection *connection G_GNUC_UNUSED,
- 
-     if (reload) {
-         VIR_DEBUG("Reload in bridge_driver because of firewalld.");
--        networkReloadFirewallRules(driver, false);
-+        networkReloadFirewallRules(driver, false, true);
-     }
- 
-     return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-@@ -798,7 +800,7 @@ networkStateInitialize(bool privileged,
-     virNetworkObjListPrune(network_driver->networks,
-                            VIR_CONNECT_LIST_NETWORKS_INACTIVE |
-                            VIR_CONNECT_LIST_NETWORKS_TRANSIENT);
--    networkReloadFirewallRules(network_driver, true);
-+    networkReloadFirewallRules(network_driver, true, false);
-     networkRefreshDaemons(network_driver);
- 
-     if (virDriverShouldAutostart(network_driver->stateDir, &autostart) < 0)
-@@ -868,7 +870,7 @@ networkStateReload(void)
-                                 network_driver->networkConfigDir,
-                                 network_driver->networkAutostartDir,
-                                 network_driver->xmlopt);
--    networkReloadFirewallRules(network_driver, false);
-+    networkReloadFirewallRules(network_driver, false, false);
-     networkRefreshDaemons(network_driver);
-     virNetworkObjListForEach(network_driver->networks,
-                              networkAutostartConfig,
-@@ -2236,14 +2238,16 @@ networkReloadFirewallRulesHelper(virNetworkObjPtr obj,
- 
- 
- static void
--networkReloadFirewallRules(virNetworkDriverStatePtr driver, bool startup)
-+networkReloadFirewallRules(virNetworkDriverStatePtr driver,
-+                           bool startup,
-+                           bool force)
- {
-     VIR_INFO("Reloading iptables rules");
-     /* Ideally we'd not even register the driver when unprivilegd
-      * but until we untangle the virt driver that's not viable */
-     if (!driver->privileged)
-         return;
--    networkPreReloadFirewallRules(driver, startup);
-+    networkPreReloadFirewallRules(driver, startup, force);
-     virNetworkObjListForEach(driver->networks,
-                              networkReloadFirewallRulesHelper,
-                              NULL);
-diff --git a/src/network/bridge_driver_linux.c b/src/network/bridge_driver_linux.c
-index 80bd2409e1..b0bd207250 100644
---- a/src/network/bridge_driver_linux.c
-+++ b/src/network/bridge_driver_linux.c
-@@ -36,11 +36,14 @@ VIR_LOG_INIT("network.bridge_driver_linux");
- #define PROC_NET_ROUTE "/proc/net/route"
- 
- static virOnceControl createdOnce;
--static bool createdChains;
-+static bool chainInitDone; /* true iff networkSetupPrivateChains was ever called */
-+static bool createdChains; /* true iff networkSetupPrivateChains created chains during most recent call */
- static virErrorPtr errInitV4;
- static virErrorPtr errInitV6;
- 
--/* Only call via virOnce */
-+/* Usually only called via virOnce, but can also be called directly in
-+ * response to firewalld reload (if chainInitDone == true)
-+ */
- static void networkSetupPrivateChains(void)
- {
-     int rc;
-@@ -82,6 +85,8 @@ static void networkSetupPrivateChains(void)
-             VIR_DEBUG("Global IPv6 chains already exist");
-         }
-     }
-+
-+    chainInitDone = true;
- }
- 
- 
-@@ -111,7 +116,10 @@ networkHasRunningNetworks(virNetworkDriverStatePtr driver)
- }
- 
- 
--void networkPreReloadFirewallRules(virNetworkDriverStatePtr driver, bool startup)
-+void
-+networkPreReloadFirewallRules(virNetworkDriverStatePtr driver,
-+                              bool startup,
-+                              bool force)
- {
-     /*
-      * If there are any running networks, we need to
-@@ -130,29 +138,42 @@ void networkPreReloadFirewallRules(virNetworkDriverStatePtr driver, bool startup
-      * of starting the network though as that makes them
-      * more likely to be seen by a human
-      */
--    if (!networkHasRunningNetworks(driver)) {
--        VIR_DEBUG("Delayed global rule setup as no networks are running");
--        return;
--    }
-+    if (chainInitDone && force) {
-+        /* The Private chains have already been initialized once
-+         * during this run of libvirtd, so 1) we can't do it again via
-+         * virOnce(), and 2) we need to re-add the private chains even
-+         * if there are currently no running networks, because the
-+         * next time a network is started, libvirt will expect that
-+         * the chains have already been added. So we call directly
-+         * instead of via virOnce().
-+         */
-+        networkSetupPrivateChains();
- 
--    ignore_value(virOnce(&createdOnce, networkSetupPrivateChains));
-+    } else {
-+        if (!networkHasRunningNetworks(driver)) {
-+            VIR_DEBUG("Delayed global rule setup as no networks are running");
-+            return;
-+        }
- 
--    /*
--     * If this is initial startup, and we just created the
--     * top level private chains we either
--     *
--     *   - upgraded from old libvirt
--     *   - freshly booted from clean state
--     *
--     * In the first case we must delete the old rules from
--     * the built-in chains, instead of our new private chains.
--     * In the second case it doesn't matter, since no existing
--     * rules will be present. Thus we can safely just tell it
--     * to always delete from the builin chain
--     */
--    if (startup && createdChains) {
--        VIR_DEBUG("Requesting cleanup of legacy firewall rules");
--        iptablesSetDeletePrivate(false);
-+        ignore_value(virOnce(&createdOnce, networkSetupPrivateChains));
-+
-+        /*
-+         * If this is initial startup, and we just created the
-+         * top level private chains we either
-+         *
-+         *   - upgraded from old libvirt
-+         *   - freshly booted from clean state
-+         *
-+         * In the first case we must delete the old rules from
-+         * the built-in chains, instead of our new private chains.
-+         * In the second case it doesn't matter, since no existing
-+         * rules will be present. Thus we can safely just tell it
-+         * to always delete from the builin chain
-+         */
-+        if (startup && createdChains) {
-+            VIR_DEBUG("Requesting cleanup of legacy firewall rules");
-+            iptablesSetDeletePrivate(false);
-+        }
-     }
- }
- 
-diff --git a/src/network/bridge_driver_nop.c b/src/network/bridge_driver_nop.c
-index 08d737511f..db89c10023 100644
---- a/src/network/bridge_driver_nop.c
-+++ b/src/network/bridge_driver_nop.c
-@@ -20,7 +20,8 @@
- #include <config.h>
- 
- void networkPreReloadFirewallRules(virNetworkDriverStatePtr driver G_GNUC_UNUSED,
--                                   bool startup G_GNUC_UNUSED)
-+                                   bool startup G_GNUC_UNUSED,
-+                                   bool force G_GNUC_UNUSED)
- {
- }
- 
-diff --git a/src/network/bridge_driver_platform.h b/src/network/bridge_driver_platform.h
-index 169417a6c0..48ab52c160 100644
---- a/src/network/bridge_driver_platform.h
-+++ b/src/network/bridge_driver_platform.h
-@@ -62,7 +62,7 @@ struct _virNetworkDriverState {
- typedef struct _virNetworkDriverState virNetworkDriverState;
- typedef virNetworkDriverState *virNetworkDriverStatePtr;
- 
--void networkPreReloadFirewallRules(virNetworkDriverStatePtr driver, bool startup);
-+void networkPreReloadFirewallRules(virNetworkDriverStatePtr driver, bool startup, bool force);
- void networkPostReloadFirewallRules(bool startup);
- 
- int networkCheckRouteCollision(virNetworkDefPtr def);

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-systemd-start-libvirtd-after-firewalld-iptables-serv.patch

@@ -1,100 +0,0 @@
-From: Laine Stump <laine@redhat.com>
-Date: Fri, 1 May 2020 00:05:50 -0400
-Subject: [PATCH] systemd: start libvirtd after firewalld/iptables services
-
-When a system has enabled the iptables/ip6tables services rather than
-firewalld, there is no explicit ordering of the start of those
-services vs. libvirtd. This creates a problem when libvirtd.service is
-started before ip[6]tables, as the latter, when it finally is started,
-will remove all of the iptables rules that had previously been added
-by libvirt, including the custom chains where libvirt's rules are
-kept. This results in an error message similar to the following when a
-user subsequently tries to start a new libvirt network:
-
- "Error while activating network: Call to virNetworkCreate failed:
- internal error: Failed to apply firewall rules
- /usr/sbin/ip6tables -w --table filter --insert LIBVIRT_FWO \
-   --in-interface virbr2 --jump REJECT:
- ip6tables: No chain/target/match by that name."
-
-(Prior to logging this error, it also would have caused failure to
-forward (or block) traffic in some cases, e.g. for guests on a NATed
-network, since libvirt's rules to forward/block had all been deleted
-and libvirt didn't know about it, so it couldn't fix the problem)
-
-When this happens, the problem can be remedied by simply restarting
-libvirtd.service (which has the side-effect of reloading all
-libvirt-generated firewall rules)
-
-Instead, we can just explicitly stating in the libvirtd.service file
-that libvirtd.service should start after ip6tables.service and
-ip6tables.service, eliminating the race condition that leads to the
-error.
-
-There is also nothing (that I can see) in the systemd .service files
-to guarantee that firewalld.service will be started (if enabled) prior
-to libvirtd.service. The same error scenario given above would occur
-if libvirtd.service started before firewalld.service.  Even before
-that, though libvirtd would have detected that firewalld.service was
-disabled, and then turn off all firewalld support. So, for example,
-firewalld's libvirt zone wouldn't be used, and most likely traffic
-from guests would therefore be blocked (all with no external
-indication of the source of the problem other than a debug-level log
-when libvirtd was started saying that firewalld wasn't in use); also
-libvirtd wouldn't notice when firewalld reloaded its rules (which also
-simultaneously deletes all of libvirt's rules).
-
-I'm not aware of any reports that have been traced back to
-libvirtd.service starting before firewalld.service, but have seen that
-error reported multiple times, and also don't see an existing
-dependency that would guarantee firewalld.service starts before
-libvirtd.service, so it's possible it's been happening and we just
-haven't gotten to the bottom of it.
-
-This patch adds an After= line to the libvirtd.service file for each
-of iptables.service, ip6tables.service, and firewalld.servicee, which
-should guarantee that libvirtd.service isn't started until systemd has
-started whichever of the others is enabled.
-
-This race was diagnosed, and patch proposed, by Jason Montleon in
-https://bugzilla.redhat.com/1723698 . At the time (April 2019) danpb
-agreed with him that this change to libvirtd.service was a reasonable
-thing to do, but I guess everyone thought someone else was going to
-post a patch, so in the end nobody did.
-
-Signed-off-by: Laine Stump <laine@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 0756415f147dda15a417bd79eef9a62027d176e6)
----
- src/network/virtnetworkd.service.in | 3 +++
- src/remote/libvirtd.service.in      | 3 +++
- 2 files changed, 6 insertions(+)
-
-diff --git a/src/network/virtnetworkd.service.in b/src/network/virtnetworkd.service.in
-index 656e8b4f84..56182e1693 100644
---- a/src/network/virtnetworkd.service.in
-+++ b/src/network/virtnetworkd.service.in
-@@ -5,6 +5,9 @@ Requires=virtnetworkd.socket
- Requires=virtnetworkd-ro.socket
- Requires=virtnetworkd-admin.socket
- After=network.target
-+After=firewalld.service
-+After=iptables.service
-+After=ip6tables.service
- After=dbus.service
- After=apparmor.service
- After=local-fs.target
-diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in
-index 90b2cad5b0..cc0d4e3693 100644
---- a/src/remote/libvirtd.service.in
-+++ b/src/remote/libvirtd.service.in
-@@ -11,6 +11,9 @@ Wants=libvirtd-admin.socket
- Wants=systemd-machined.service
- Before=libvirt-guests.service
- After=network.target
-+After=firewalld.service
-+After=iptables.service
-+After=ip6tables.service
- After=dbus.service
- After=iscsid.service
- After=apparmor.service

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-libxl-fix-crash-when-initializing-driver.patch

@@ -1,43 +0,0 @@
-From: Jim Fehlig <jfehlig@suse.com>
-Date: Fri, 3 Apr 2020 15:51:48 -0600
-Subject: [PATCH] libxl: fix crash when initializing driver
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit 54a401af478 split out DriverConfigInit from DriverConfigNew, but
-then called it a bit late from libxlStateInitialize. The cfg is used in
-libxlDriverConfigLoadFile and when uninitialized results in a crash.
-Calling DriverConfigInit immediately after DriverConfigNew fixes the
-crash.
-
-Signed-off-by: Jim Fehlig <jfehlig@suse.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 88011ed280c4f946a7b8e7ffcea2335eb075de60)
----
- src/libxl/libxl_driver.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
-index f2387e2a20..c4fb791fa0 100644
---- a/src/libxl/libxl_driver.c
-+++ b/src/libxl/libxl_driver.c
-@@ -703,14 +703,14 @@ libxlStateInitialize(bool privileged,
-     if (!(cfg = libxlDriverConfigNew()))
-         goto error;
- 
-+    if (libxlDriverConfigInit(cfg) < 0)
-+        goto error;
-+
-     driverConf = g_strdup_printf("%s/libxl.conf", cfg->configBaseDir);
- 
-     if (libxlDriverConfigLoadFile(cfg, driverConf) < 0)
-         goto error;
- 
--    if (libxlDriverConfigInit(cfg) < 0)
--        goto error;
--
-     /* Register the callbacks providing access to libvirt's event loop */
-     libxl_osevent_register_hooks(cfg->ctx, &libxl_osevent_callbacks, cfg->ctx);
- 

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"));

libvirt.spec

@@ -4,7 +4,7 @@
 # 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 30
+%define min_fedora 31
 
 %if (0%{?fedora} && 0%{?fedora} >= %{min_fedora}) || (0%{?rhel} && 0%{?rhel} >= %{min_rhel})
     %define supported_platform 1
@@ -28,7 +28,7 @@
 %define qemu_kvm_arches %{ix86} x86_64
 
 %if 0%{?fedora}
-    %define qemu_kvm_arches %{ix86} x86_64 %{power64} s390x %{arm} aarch64
+    %define qemu_kvm_arches %{ix86} x86_64 %{power64} s390x %{arm} aarch64 riscv64
 %endif
 
 %if 0%{?rhel}
@@ -147,7 +147,7 @@
 
 %define with_firewalld 1
 
-%if 0%{?fedora} >= 31 || 0%{?rhel} > 7
+%if 0%{?fedora} || 0%{?rhel} > 7
     %define with_firewalld_zone 0%{!?_without_firewalld_zone:1}
 %endif
 
@@ -217,8 +217,8 @@
 
 Summary: Library providing a simple virtualization API
 Name: libvirt
-Version: 6.1.0
-Release: 4%{?dist}
+Version: 6.6.0
+Release: 5%{?dist}
 License: LGPLv2+
 URL: https://libvirt.org/
 
@@ -227,15 +227,17 @@ URL: https://libvirt.org/
 %endif
 Source: https://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.xz
 
-# Check for disk type correctly in virDomainDiskTranslateSourcePool
-Patch0001: 0001-virDomainDiskTranslateSourcePool-Check-for-disk-type.patch
-# Fix iptables No chain/target/match by that name (bz #1813830)
-Patch0002: 0002-network-make-it-safe-to-call-networkSetupPrivateChai.patch
-Patch0003: 0003-network-force-re-creation-of-iptables-private-chains.patch
-# systemd: start libvirtd after firewalld/iptables services (bz #1697636)
-Patch0004: 0004-systemd-start-libvirtd-after-firewalld-iptables-serv.patch
-# Fix libxl driver startup crash (bz #1842318)
-Patch0005: 0005-libxl-fix-crash-when-initializing-driver.patch
+# Fix creation of pools on non-btrfs (bz #1870197)
+Patch0001: 0001-util-Fix-logic-in-virFileSetCOW.patch
+# devmapper fixes
+Patch0002: 0002-virdevmapper-Don-t-cache-device-mapper-major.patch
+Patch0003: 0003-virdevmapper-Handle-kernel-without-device-mapper-sup.patch
+Patch0004: 0004-virdevmapper-Ignore-all-errors-when-opening-dev-mapp.patch
+# Fix noisy log error 'Failed to open file ...unique_id...' (bz #1692100)
+Patch0005: 0005-util-use-g_autofree-in-virSCSIHostGetUniqueId.patch
+Patch0006: 0006-util-quieten-virSCSIHostGetUniqueId.patch
+# Fix USB device error 'vendor cannot be 0' (bz #1897625)
+Patch0007: 0007-node_device-Use-udev-monitor-source.patch
 
 Requires: libvirt-daemon = %{version}-%{release}
 Requires: libvirt-daemon-config-network = %{version}-%{release}
@@ -279,6 +281,7 @@ BuildRequires: python36-docutils
 BuildRequires: python3-docutils
 %endif
 BuildRequires: gcc
+BuildRequires: make
 BuildRequires: git
 %if 0%{?fedora} || 0%{?rhel} > 7
 BuildRequires: perl-interpreter
@@ -297,7 +300,6 @@ BuildRequires: readline-devel
 %if %{with_bash_completion}
 BuildRequires: bash-completion >= 2.0
 %endif
-BuildRequires: ncurses-devel
 BuildRequires: gettext
 BuildRequires: libtasn1-devel
 BuildRequires: gnutls-devel
@@ -415,11 +417,13 @@ BuildRequires: wireshark-devel >= 2.4.0
 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
-BuildRequires: libtirpc-devel
 %endif
 
+BuildRequires: libtirpc-devel
+
 %if %{with_firewalld_zone}
 BuildRequires: firewalld-filesystem
 %endif
@@ -532,6 +536,10 @@ Requires: libvirt-daemon = %{version}-%{release}
 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
@@ -906,7 +914,6 @@ capabilities of VirtualBox
 Summary: Client side utilities of the libvirt library
 Requires: %{name}-libs = %{version}-%{release}
 Requires: readline
-Requires: ncurses
 # Needed by /usr/libexec/libvirt-guests.sh script.
 Requires: gettext
 # Needed by virt-pki-validate script.
@@ -1005,6 +1012,11 @@ Libvirt plugin for NSS for translating domain names into IP addresses.
 %autosetup -S git_am
 
 %build
+# Disable LTO since it caused test failures by breaking LD_PRELOAD usage.
+# Upstream libvirt changed to meson and appears to succeed with LTO, so
+# remove this when rebasing to libvirt 6.7.0 or newer
+%define _lto_cflags %{nil}
+
 %if ! %{supported_platform}
 echo "This RPM requires either Fedora >= %{min_fedora} or RHEL >= %{min_rhel}"
 exit 1
@@ -1515,7 +1527,7 @@ exit 0
 %files
 
 %files docs
-%doc AUTHORS ChangeLog NEWS README README.md
+%doc AUTHORS ChangeLog NEWS.rst README README.rst
 %doc %{_vpath_builddir}/libvirt-docs/*
 
 %files daemon
@@ -1542,6 +1554,7 @@ exit 0
 %{_unitdir}/virtlockd.socket
 %{_unitdir}/virtlockd-admin.socket
 %config(noreplace) %{_sysconfdir}/sysconfig/libvirtd
+%config(noreplace) %{_sysconfdir}/sysconfig/virtproxyd
 %config(noreplace) %{_sysconfdir}/sysconfig/virtlogd
 %config(noreplace) %{_sysconfdir}/sysconfig/virtlockd
 %config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf
@@ -1610,6 +1623,7 @@ exit 0
 %ghost %{_sysconfdir}/libvirt/nwfilter/*.xml
 
 %files daemon-driver-interface
+%config(noreplace) %{_sysconfdir}/sysconfig/virtinterfaced
 %config(noreplace) %{_sysconfdir}/libvirt/virtinterfaced.conf
 %{_datadir}/augeas/lenses/virtinterfaced.aug
 %{_datadir}/augeas/lenses/tests/test_virtinterfaced.aug
@@ -1621,6 +1635,7 @@ exit 0
 %{_libdir}/%{name}/connection-driver/libvirt_driver_interface.so
 
 %files daemon-driver-network
+%config(noreplace) %{_sysconfdir}/sysconfig/virtnetworkd
 %config(noreplace) %{_sysconfdir}/libvirt/virtnetworkd.conf
 %{_datadir}/augeas/lenses/virtnetworkd.aug
 %{_datadir}/augeas/lenses/tests/test_virtnetworkd.aug
@@ -1643,6 +1658,7 @@ exit 0
 %endif
 
 %files daemon-driver-nodedev
+%config(noreplace) %{_sysconfdir}/sysconfig/virtnodedevd
 %config(noreplace) %{_sysconfdir}/libvirt/virtnodedevd.conf
 %{_datadir}/augeas/lenses/virtnodedevd.aug
 %{_datadir}/augeas/lenses/tests/test_virtnodedevd.aug
@@ -1654,6 +1670,7 @@ exit 0
 %{_libdir}/%{name}/connection-driver/libvirt_driver_nodedev.so
 
 %files daemon-driver-nwfilter
+%config(noreplace) %{_sysconfdir}/sysconfig/virtnwfilterd
 %config(noreplace) %{_sysconfdir}/libvirt/virtnwfilterd.conf
 %{_datadir}/augeas/lenses/virtnwfilterd.aug
 %{_datadir}/augeas/lenses/tests/test_virtnwfilterd.aug
@@ -1667,6 +1684,7 @@ exit 0
 %{_libdir}/%{name}/connection-driver/libvirt_driver_nwfilter.so
 
 %files daemon-driver-secret
+%config(noreplace) %{_sysconfdir}/sysconfig/virtsecretd
 %config(noreplace) %{_sysconfdir}/libvirt/virtsecretd.conf
 %{_datadir}/augeas/lenses/virtsecretd.aug
 %{_datadir}/augeas/lenses/tests/test_virtsecretd.aug
@@ -1680,6 +1698,7 @@ exit 0
 %files daemon-driver-storage
 
 %files daemon-driver-storage-core
+%config(noreplace) %{_sysconfdir}/sysconfig/virtstoraged
 %config(noreplace) %{_sysconfdir}/libvirt/virtstoraged.conf
 %{_datadir}/augeas/lenses/virtstoraged.aug
 %{_datadir}/augeas/lenses/tests/test_virtstoraged.aug
@@ -1736,6 +1755,7 @@ exit 0
 
 %if %{with_qemu}
 %files daemon-driver-qemu
+%config(noreplace) %{_sysconfdir}/sysconfig/virtqemud
 %config(noreplace) %{_sysconfdir}/libvirt/virtqemud.conf
 %{_datadir}/augeas/lenses/virtqemud.aug
 %{_datadir}/augeas/lenses/tests/test_virtqemud.aug
@@ -1763,6 +1783,7 @@ exit 0
 
 %if %{with_lxc}
 %files daemon-driver-lxc
+%config(noreplace) %{_sysconfdir}/sysconfig/virtlxcd
 %config(noreplace) %{_sysconfdir}/libvirt/virtlxcd.conf
 %{_datadir}/augeas/lenses/virtlxcd.aug
 %{_datadir}/augeas/lenses/tests/test_virtlxcd.aug
@@ -1784,6 +1805,7 @@ exit 0
 
 %if %{with_libxl}
 %files daemon-driver-libxl
+%config(noreplace) %{_sysconfdir}/sysconfig/virtxend
 %config(noreplace) %{_sysconfdir}/libvirt/virtxend.conf
 %{_datadir}/augeas/lenses/virtxend.aug
 %{_datadir}/augeas/lenses/tests/test_virtxend.aug
@@ -1805,6 +1827,7 @@ exit 0
 
 %if %{with_vbox}
 %files daemon-driver-vbox
+%config(noreplace) %{_sysconfdir}/sysconfig/virtvboxd
 %config(noreplace) %{_sysconfdir}/libvirt/virtvboxd.conf
 %{_datadir}/augeas/lenses/virtvboxd.aug
 %{_datadir}/augeas/lenses/tests/test_virtvboxd.aug
@@ -1983,12 +2006,36 @@ exit 0
 
 
 %changelog
-* Tue Jun 02 2020 Cole Robinson <crobinso@redhat.com> - 6.1.0-4
-- Fix libxl driver startup crash (bz #1842318)
+* Mon Dec 07 2020 Cole Robinson <crobinso@redhat.com> - 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)
 
-* Tue May 26 2020 Cole Robinson <crobinso@redhat.com> - 6.1.0-3
-- Fix iptables No chain/target/match by that name (bz #1813830)
-- systemd: start libvirtd after firewalld/iptables services (bz #1697636)
+* Fri Dec 04 2020 Richard W.M. Jones <rjones@redhat.com> - 6.10.0-2
+- Build libvirt-daemon-kvm for riscv64.
+
+* Tue Nov 03 2020 Cole Robinson <crobinso@redhat.com> - 6.6.0-3
+- devmapper fixes
+
+* Fri Aug 21 2020 Daniel P. Berrangé <berrange@redhat.com> - 6.6.0-2
+- Fix creation of pools on non-btrfs (rhbz#1870197)
+
+* Tue Aug 04 2020 Cole Robinson <crobinso@redhat.com> - 6.6.0-1
+- Update to version 6.6.0
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.5.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jul 03 2020 Cole Robinson <crobinso@redhat.com> - 6.5.0-1
+- Update to version 6.5.0
+
+* Tue Jun 02 2020 Cole Robinson <crobinso@redhat.com> - 6.4.0-1
+- Update to version 6.4.0
+
+* Tue May 05 2020 Cole Robinson <crobinso@redhat.com> - 6.3.0-1
+- Update to version 6.3.0
+
+* Thu Apr 02 2020 Cole Robinson <crobinso@redhat.com> - 6.2.0-1
+- Update to version 6.2.0
 
 * Tue Mar 24 2020 Felipe Borges <feborges@redhat.com> - 6.1.0-2
 - Check for disk type correctly in virDomainDiskTranslateSourcePool

sources

@@ -1 +1 @@
-SHA512 (libvirt-6.1.0.tar.xz) = 17a2641f300a4a05149261bae74ac856e9a2511a259146595d2e2412c4a0601d88369b0544ba86edc80e433a47cf828317d8de38c6ec86a1b3efaca75294a606
+SHA512 (libvirt-6.6.0.tar.xz) = 55091addcf43d3c0bdd50f9378b588351181d191272d5a19220a0babe0893c1f6e0f1e41a7f51b8c1fb8e2098236b273e1a18b81573f4008ee3cf65374ba9465