Add qemu.conf options for audio workaround

Fix parsing certain USB sysfs files (bz 598272) Sanitize pool target paths (bz 494005) Add qemu.conf for clear emulator capabilities Prevent libvirtd inside a VM from breaking network access (bz 235961) Mention --all in 'virsh list' docs (bz 575512) Initscript fixes (bz 565238) List wireless interfaces via nodedev-list (bz 596928)
Fix nodedev XML conversion errors (bz 591262)
2010-06-17 17:42:36 +00:00 · 2010-05-18 18:49:49 +00:00 · 2010-04-20 19:39:41 +00:00 · 2010-03-22 15:09:54 +00:00 · 2010-03-05 17:11:45 +00:00 · 2010-03-05 16:59:20 +00:00
34 changed files with 2679 additions and 4505 deletions
@@ -1,31 +0,0 @@
-[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.*
@@ -0,0 +1,18 @@
+.build*.log
+*.rpm
+i686
+x86_64
+libvirt-*.tar.gz
+libvirt-0.6.0.tar.gz
+libvirt-0.6.1.tar.gz
+libvirt-0.6.2.tar.gz
+libvirt-0.6.3.tar.gz
+libvirt-0.6.4.tar.gz
+libvirt-0.6.5.tar.gz
+libvirt-0.7.0.tar.gz
+libvirt-0.7.1.tar.gz
+libvirt-0.7.2.tar.gz
+libvirt-0.7.3.tar.gz
+libvirt-0.7.4.tar.gz
+libvirt-0.7.5.tar.gz
+libvirt-0.7.6.tar.gz
@@ -1,5 +0,0 @@
-.build*.log
-*.rpm
-i686
-x86_64
-libvirt-*.tar.xz
@@ -1,29 +0,0 @@
-From: Martin Kletzander <mkletzan@redhat.com>
-Date: Fri, 16 Aug 2024 13:56:51 +0200
-Subject: [PATCH] virarptable: Properly calculate rtattr length
-Content-type: text/plain
-
-Use convenience macro which does almost the same thing we were doing,
-but also pads out the payload length to a multiple of NLMSG_ALIGNTO (4)
-bytes.
-
-Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
-Reviewed-by: Laine Stump <laine@redhat.com>
---
- src/util/virarptable.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/util/virarptable.c b/src/util/virarptable.c
-index 299dddd664..d8e41c5a86 100644
--- a/src/util/virarptable.c
-+++ b/src/util/virarptable.c
-@@ -102,8 +102,7 @@ virArpTableGet(void)
-             return table;
- 
-         VIR_WARNINGS_NO_CAST_ALIGN
-        parse_rtattr(tb, NDA_MAX, NDA_RTA(r),
-                     nh->nlmsg_len - NLMSG_LENGTH(sizeof(*r)));
-+        parse_rtattr(tb, NDA_MAX, NDA_RTA(r), NLMSG_PAYLOAD(nh, sizeof(*r)));
-         VIR_WARNINGS_RESET
- 
-         if (tb[NDA_DST] == NULL || tb[NDA_LLADDR] == NULL)
@@ -1,34 +0,0 @@
-From: Martin Kletzander <mkletzan@redhat.com>
-Date: Fri, 16 Aug 2024 13:59:15 +0200
-Subject: [PATCH] virarptable: Fix check for message length
-Content-type: text/plain
-
-The previous check was all wrong since it calculated the how long would
-the netlink message be if the netlink header was the payload and then
-subtracted that from the whole message length, a variable that was not
-used later in the code.  This check can fail if there are no additional
-payloads, struct rtattr in particular, which we are parsing later,
-however the RTA_OK macro would've caught that anyway.
-
-Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
-Reviewed-by: Laine Stump <laine@redhat.com>
---
- src/util/virarptable.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/util/virarptable.c b/src/util/virarptable.c
-index d8e41c5a86..45ee76766f 100644
--- a/src/util/virarptable.c
-+++ b/src/util/virarptable.c
-@@ -81,10 +81,9 @@ virArpTableGet(void)
-     for (; NLMSG_OK(nh, msglen); nh = NLMSG_NEXT(nh, msglen)) {
-         VIR_WARNINGS_RESET
-         struct ndmsg *r = NLMSG_DATA(nh);
-        int len = nh->nlmsg_len;
-         void *addr;
- 
-        if ((len -= NLMSG_LENGTH(sizeof(*nh))) < 0) {
-+        if (nh->nlmsg_len < NLMSG_SPACE(sizeof(*r))) {
-             virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                            _("wrong nlmsg len"));
-             goto cleanup;
@@ -1,46 +0,0 @@
-From: Martin Kletzander <mkletzan@redhat.com>
-Date: Fri, 16 Aug 2024 14:02:48 +0200
-Subject: [PATCH] virarptable: End parsing earlier in case of NLMSG_DONE
-Content-type: text/plain
-
-Check for the last multipart message right as the first thing.  The
-presumption probably was that the last message might still contain a
-payload we want to parse.  However that cannot be true since that would
-have to be a type RTM_NEWNEIGH.  This was not caught because older
-kernels were note sending NLMSG_DONE and probably relied on the fact
-that the parsing just stops after all the messages are walked through,
-which the NLMSG_OK macro successfully did.
-
-Resolves: https://issues.redhat.com/browse/RHEL-52449
-Resolves: https://bugzilla.redhat.com/2302245
-Fixes: a176d67cdfaf5b8237a7e3a80d8be0e6bdf2d8fd
-Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
-Reviewed-by: Laine Stump <laine@redhat.com>
---
- src/util/virarptable.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/util/virarptable.c b/src/util/virarptable.c
-index 45ee76766f..20d11f97b0 100644
--- a/src/util/virarptable.c
-+++ b/src/util/virarptable.c
-@@ -83,6 +83,9 @@ virArpTableGet(void)
-         struct ndmsg *r = NLMSG_DATA(nh);
-         void *addr;
- 
-+        if (nh->nlmsg_type == NLMSG_DONE)
-+            break;
-+
-         if (nh->nlmsg_len < NLMSG_SPACE(sizeof(*r))) {
-             virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                            _("wrong nlmsg len"));
-@@ -97,9 +100,6 @@ virArpTableGet(void)
-             (!(r->ndm_state == NUD_STALE || r->ndm_state == NUD_REACHABLE)))
-             continue;
- 
-        if (nh->nlmsg_type == NLMSG_DONE)
-            return table;
-
-         VIR_WARNINGS_NO_CAST_ALIGN
-         parse_rtattr(tb, NDA_MAX, NDA_RTA(r), NLMSG_PAYLOAD(nh, sizeof(*r)));
-         VIR_WARNINGS_RESET
@@ -1,315 +0,0 @@
-From 807e2670f2704c41f0a1dca81a5d2f2f9336137c Mon Sep 17 00:00:00 2001
-From: Laine Stump <laine@redhat.com>
-Date: Mon, 25 Nov 2024 22:24:44 -0500
-Subject: [PATCH 4/9] util: use a single flags arg for virNetDevBandwidthSet(),
- not multiple bools
-
-Having two bools in the arg list is on the borderline of being
-confusing to anyone trying to read the code, but we're about to add a
-3rd. This patch replaces the two bools with a single flags argument
-which will instead have one or more bits from virNetDevBandwidthFlags
-set.
-
-Signed-off-by: Laine Stump <laine@redhat.com>
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---
- src/lxc/lxc_driver.c           |  8 ++++++--
- src/lxc/lxc_process.c          |  8 ++++++--
- src/network/bridge_driver.c    | 10 ++++++++--
- src/qemu/qemu_command.c        | 11 ++++++++---
- src/qemu/qemu_driver.c         | 29 ++++++++++++++-------------
- src/qemu/qemu_hotplug.c        | 22 +++++++++++++++------
- src/util/virnetdevbandwidth.c  | 36 ++++++++++++++++++++--------------
- src/util/virnetdevbandwidth.h  |  9 +++++++--
- tests/virnetdevbandwidthtest.c |  8 +++++++-
- 9 files changed, 94 insertions(+), 47 deletions(-)
-
-diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
-index 534e257f30..b693980dbb 100644
--- a/src/lxc/lxc_driver.c
-+++ b/src/lxc/lxc_driver.c
-@@ -3570,8 +3570,12 @@ lxcDomainAttachDeviceNetLive(virLXCDriver *driver,
-     actualBandwidth = virDomainNetGetActualBandwidth(net);
-     if (actualBandwidth) {
-         if (virNetDevSupportsBandwidth(actualType)) {
-            if (virNetDevBandwidthSet(net->ifname, actualBandwidth, false,
-                                      !virDomainNetTypeSharesHostView(net)) < 0)
-+            unsigned int flags = 0;
-+
-+            if (!virDomainNetTypeSharesHostView(net))
-+                flags |= VIR_NETDEV_BANDWIDTH_SET_DIR_SWAPPED;
-+
-+            if (virNetDevBandwidthSet(net->ifname, actualBandwidth, flags) < 0)
-                 goto cleanup;
-         } else {
-             VIR_WARN("setting bandwidth on interfaces of "
-diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
-index f5eb5383ec..0e689fbb70 100644
--- a/src/lxc/lxc_process.c
-+++ b/src/lxc/lxc_process.c
-@@ -605,8 +605,12 @@ virLXCProcessSetupInterfaces(virLXCDriver *driver,
-         actualBandwidth = virDomainNetGetActualBandwidth(net);
-         if (actualBandwidth) {
-             if (virNetDevSupportsBandwidth(type)) {
-                if (virNetDevBandwidthSet(net->ifname, actualBandwidth, false,
-                                          !virDomainNetTypeSharesHostView(net)) < 0)
-+                unsigned int flags = 0;
-+
-+                if (!virDomainNetTypeSharesHostView(net))
-+                    flags |= VIR_NETDEV_BANDWIDTH_SET_DIR_SWAPPED;
-+
-+                if (virNetDevBandwidthSet(net->ifname, actualBandwidth, flags) < 0)
-                     goto cleanup;
-             } else {
-                 VIR_WARN("setting bandwidth on interfaces of "
-diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
-index 32572c755f..1c53636450 100644
--- a/src/network/bridge_driver.c
-+++ b/src/network/bridge_driver.c
-@@ -2058,8 +2058,11 @@ networkStartNetworkVirtual(virNetworkDriverState *driver,
-         }
-     }
- 
-    if (virNetDevBandwidthSet(def->bridge, def->bandwidth, true, true) < 0)
-+    if (virNetDevBandwidthSet(def->bridge, def->bandwidth,
-+                              VIR_NETDEV_BANDWIDTH_SET_HIERARCHICAL_CLASS
-+                              | VIR_NETDEV_BANDWIDTH_SET_DIR_SWAPPED) < 0) {
-         goto error;
-+    }
- 
-     return 0;
- 
-@@ -2141,8 +2144,11 @@ networkStartNetworkBridge(virNetworkObj *obj)
-      * type BRIDGE, is started. On failure, undo anything you've done,
-      * and return -1. On success return 0.
-      */
-    if (virNetDevBandwidthSet(def->bridge, def->bandwidth, true, true) < 0)
-+    if (virNetDevBandwidthSet(def->bridge, def->bandwidth,
-+                              VIR_NETDEV_BANDWIDTH_SET_HIERARCHICAL_CLASS
-+                              | VIR_NETDEV_BANDWIDTH_SET_DIR_SWAPPED) < 0) {
-         goto error;
-+    }
- 
-     if (networkStartHandleMACTableManagerMode(obj) < 0)
-         goto error;
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index f15e6bda1e..b4815e5e71 100644
--- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -8840,9 +8840,14 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver,
-                                                         def->uuid,
-                                                         !virDomainNetTypeSharesHostView(net)) < 0)
-                     goto cleanup;
-            } else if (virNetDevBandwidthSet(net->ifname, actualBandwidth, false,
-                                             !virDomainNetTypeSharesHostView(net)) < 0) {
-                goto cleanup;
-+            } else {
-+                unsigned int flags = 0;
-+
-+                if (!virDomainNetTypeSharesHostView(net))
-+                    flags |= VIR_NETDEV_BANDWIDTH_SET_DIR_SWAPPED;
-+
-+                if (virNetDevBandwidthSet(net->ifname, actualBandwidth, flags) < 0)
-+                    goto cleanup;
-             }
-         } else {
-             VIR_WARN("setting bandwidth on interfaces of "
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 736602333e..14929616e5 100644
--- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -9941,21 +9941,22 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom,
-                 virErrorRestore(&orig_err);
-                 goto endjob;
-             }
-        } else if (virNetDevBandwidthSet(net->ifname, newBandwidth, false,
-                                         !virDomainNetTypeSharesHostView(net)) < 0) {
-            virErrorPtr orig_err;
-
-            virErrorPreserveLast(&orig_err);
-            ignore_value(virNetDevBandwidthSet(net->ifname,
-                                               net->bandwidth,
-                                               false,
-                                               !virDomainNetTypeSharesHostView(net)));
-            if (net->bandwidth) {
-                ignore_value(virDomainNetBandwidthUpdate(net,
-                                                         net->bandwidth));
-+        } else {
-+            unsigned int bwflags = 0;
-+
-+            if (!virDomainNetTypeSharesHostView(net))
-+                bwflags |= VIR_NETDEV_BANDWIDTH_SET_DIR_SWAPPED;
-+
-+            if (virNetDevBandwidthSet(net->ifname, newBandwidth, bwflags) < 0) {
-+                virErrorPtr orig_err;
-+
-+                virErrorPreserveLast(&orig_err);
-+                ignore_value(virNetDevBandwidthSet(net->ifname, net->bandwidth, bwflags));
-+                if (net->bandwidth)
-+                    ignore_value(virDomainNetBandwidthUpdate(net, net->bandwidth));
-+                virErrorRestore(&orig_err);
-+                goto endjob;
-             }
-            virErrorRestore(&orig_err);
-            goto endjob;
-         }
- 
-         /* If the old bandwidth was cleared out, restore qdisc. */
-diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
-index 7cb1800504..d5e7e99359 100644
--- a/src/qemu/qemu_hotplug.c
-+++ b/src/qemu/qemu_hotplug.c
-@@ -1279,9 +1279,14 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver,
-                                                         vm->def->uuid,
-                                                         !virDomainNetTypeSharesHostView(net)) < 0)
-                     goto cleanup;
-            } else if (virNetDevBandwidthSet(net->ifname, actualBandwidth, false,
-                                             !virDomainNetTypeSharesHostView(net)) < 0) {
-                goto cleanup;
-+            } else {
-+                int flags = 0;
-+
-+                if (!virDomainNetTypeSharesHostView(net))
-+                    flags |= VIR_NETDEV_BANDWIDTH_SET_DIR_SWAPPED;
-+
-+                if (virNetDevBandwidthSet(net->ifname, actualBandwidth, flags) < 0)
-+                    goto cleanup;
-             }
-         } else {
-             VIR_WARN("setting bandwidth on interfaces of "
-@@ -4082,9 +4087,14 @@ qemuDomainChangeNet(virQEMUDriver *driver,
-                                                         vm->def->uuid,
-                                                         !virDomainNetTypeSharesHostView(newdev)) < 0)
-                     goto cleanup;
-            } else if (virNetDevBandwidthSet(newdev->ifname, newb, false,
-                                             !virDomainNetTypeSharesHostView(newdev)) < 0) {
-                goto cleanup;
-+            } else {
-+                int flags = 0;
-+
-+                if (!virDomainNetTypeSharesHostView(newdev))
-+                    flags |= VIR_NETDEV_BANDWIDTH_SET_DIR_SWAPPED;
-+
-+                if (virNetDevBandwidthSet(newdev->ifname, newb, flags) < 0)
-+                    goto cleanup;
-             }
-         } else {
-             if (virDomainInterfaceClearQoS(vm->def, olddev) < 0)
-diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c
-index 2b58c58d3e..1baad849c6 100644
--- a/src/util/virnetdevbandwidth.c
-+++ b/src/util/virnetdevbandwidth.c
-@@ -173,30 +173,35 @@ virNetDevBandwidthManipulateFilter(const char *ifname,
-  * virNetDevBandwidthSet:
-  * @ifname: on which interface
-  * @bandwidth: rates to set (may be NULL)
- * @hierarchical_class: whether to create hierarchical class
- * @swapped: true if IN/OUT should be set contrariwise
-+ * @flags: bits indicating certain optional actions
-  *
-+
-  * This function enables QoS on specified interface
-  * and set given traffic limits for both, incoming
- * and outgoing traffic. Any previous setting get
- * overwritten. If @hierarchical_class is TRUE, create
- * hierarchical class. It is used to guarantee minimal
- * throughput ('floor' attribute in NIC).
-+ * and outgoing traffic.
-+ *
-+ * @flags bits and their meanings:
-+ *
-+ *   VIR_NETDEV_BANDWIDTH_SET_HIERARCHICAL_CLASS
-+ *     whether to create a hierarchical class
-+ *     A hiearchical class structure is used to implement a minimal
-+ *     throughput guarantee ('floor' attribute in NIC).
-  *
- * If @swapped is set, the IN part of @bandwidth is set on
- * @ifname's TX, and vice versa. If it is not set, IN is set on
- * RX and OUT on TX. This is because for some types of interfaces
- * domain and the host live on the same side of the interface (so
- * domain's RX/TX is host's RX/TX), and for some it's swapped
- * (domain's RX/TX is hosts's TX/RX).
-+ *   VIR_NETDEV_BANDWIDTH_SET_DIR_SWAPPED
-+ *     set if IN/OUT should be set backwards from what's indicated in
-+ *     the bandwidth, i.e. the IN part of @bandwidth is set on
-+ *     @ifname's TX, and the OUT part of @bandwidth is set on
-+ *     @ifname's RX.  This is needed because for some types of
-+ *     interfaces the domain and the host live on the same side of the
-+ *     interface (so domain's RX/TX is host's RX/TX), and for some
-+ *     it's swapped (domain's RX/TX is hosts's TX/RX).
-  *
-  * Return 0 on success, -1 otherwise.
-  */
- int
- virNetDevBandwidthSet(const char *ifname,
-                       const virNetDevBandwidth *bandwidth,
-                      bool hierarchical_class,
-                      bool swapped)
-+                      unsigned int flags)
- {
-     int ret = -1;
-     virNetDevBandwidthRate *rx = NULL; /* From domain POV */
-@@ -205,6 +210,7 @@ virNetDevBandwidthSet(const char *ifname,
-     char *average = NULL;
-     char *peak = NULL;
-     char *burst = NULL;
-+    bool hierarchical_class = flags & VIR_NETDEV_BANDWIDTH_SET_HIERARCHICAL_CLASS;
- 
-     if (!bandwidth) {
-         /* nothing to be enabled */
-@@ -224,7 +230,7 @@ virNetDevBandwidthSet(const char *ifname,
-         return -1;
-     }
- 
-    if (swapped) {
-+    if (flags & VIR_NETDEV_BANDWIDTH_SET_DIR_SWAPPED) {
-         rx = bandwidth->out;
-         tx = bandwidth->in;
-     } else {
-diff --git a/src/util/virnetdevbandwidth.h b/src/util/virnetdevbandwidth.h
-index 6d268fb119..80dc654486 100644
--- a/src/util/virnetdevbandwidth.h
-+++ b/src/util/virnetdevbandwidth.h
-@@ -39,11 +39,16 @@ void virNetDevBandwidthFree(virNetDevBandwidth *def);
- 
- G_DEFINE_AUTOPTR_CLEANUP_FUNC(virNetDevBandwidth, virNetDevBandwidthFree);
- 
-+typedef enum {
-+    VIR_NETDEV_BANDWIDTH_SET_HIERARCHICAL_CLASS = (1 << 0),
-+    VIR_NETDEV_BANDWIDTH_SET_DIR_SWAPPED = (1 << 1),
-+} virNetDevBandwidthSetFlags;
-+
- int virNetDevBandwidthSet(const char *ifname,
-                           const virNetDevBandwidth *bandwidth,
-                          bool hierarchical_class,
-                          bool swapped)
-+                          unsigned int flags)
-     G_GNUC_WARN_UNUSED_RESULT;
-+
- int virNetDevBandwidthClear(const char *ifname);
- int virNetDevBandwidthCopy(virNetDevBandwidth **dest,
-                            const virNetDevBandwidth *src)
-diff --git a/tests/virnetdevbandwidthtest.c b/tests/virnetdevbandwidthtest.c
-index f7c38faa2e..6529ff4026 100644
--- a/tests/virnetdevbandwidthtest.c
-+++ b/tests/virnetdevbandwidthtest.c
-@@ -82,8 +82,14 @@ testVirNetDevBandwidthSet(const void *data)
-         if (virNetDevOpenvswitchInterfaceSetQos(iface, band, info->uuid, true) < 0)
-             return -1;
-     } else {
-+        unsigned int flags = VIR_NETDEV_BANDWIDTH_SET_DIR_SWAPPED;
-+
-+        if (info->hierarchical_class)
-+            flags |= VIR_NETDEV_BANDWIDTH_SET_HIERARCHICAL_CLASS;
-+
-         exp_cmd = info->exp_cmd_tc;
-        if (virNetDevBandwidthSet(iface, band, info->hierarchical_class, true) < 0)
-+
-+        if (virNetDevBandwidthSet(iface, band, flags) < 0)
-             return -1;
-     }
- 
-- 
-2.47.1
-
@@ -1,185 +0,0 @@
-From 490f58382dca2a415a5f16b6133f298d853bb379 Mon Sep 17 00:00:00 2001
-From: Laine Stump <laine@redhat.com>
-Date: Mon, 25 Nov 2024 22:24:45 -0500
-Subject: [PATCH 5/9] util: make it optional to clear existing tc
- qdiscs/filters in virNetDevBandwidthSet()
-
-virNetDevBandwidthSet() always clears all existing qdiscs and their
-subordinate filters before adding all the new qdiscs/filters. This is
-normally exactly what we want, but there is one case (the network
-driver) where the Qdisc added by virNetDevBandwidthSet() may already
-be in use by the nftables backend (which will add a rule to fix the
-checksum of dhcp packets); in that case, we *don't* want
-virNetDevBandwidthSet() to clear out the qdisc that was already added
-for nftables, and none of the bandwidth filters have been added yet,
-so there already aren't any "old" filters that need to be removed
-either - it is safe to just skip virNetDevBandwidthClear() in this
-case.
-
-To allow the network driver to set bandwidth without first clearing
-it, this patch adds the flag VIR_NETDEV_BANDWIDTH_SET_CLEAR_ALL to the
-virNetDevBandwidthSetFlags enum, and recognizes it in
-virNetDevBandwidthSet() - if the flag is set, then
-virNetDevBandwidth() will call virNetDevBandwidthClear() just as it
-always has. But if the flag isn't set it *won't* call
-virNetDevBandwidthClear().
-
-As suggested above, VIR_NETDEV_BANDWIDTH_SET_CLEAR_ALL is set for all
-calls to virNetdevBandwidthSet() except for two places in the network
-driver.
-
-Signed-off-by: Laine Stump <laine@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---
- src/lxc/lxc_driver.c           |  2 +-
- src/lxc/lxc_process.c          |  2 +-
- src/qemu/qemu_command.c        |  2 +-
- src/qemu/qemu_driver.c         |  2 +-
- src/qemu/qemu_hotplug.c        |  4 ++--
- src/util/virnetdevbandwidth.c  | 21 ++++++++++++++++++++-
- src/util/virnetdevbandwidth.h  |  1 +
- tests/virnetdevbandwidthtest.c |  3 ++-
- 8 files changed, 29 insertions(+), 8 deletions(-)
-
-diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
-index b693980dbb..81581c74df 100644
--- a/src/lxc/lxc_driver.c
-+++ b/src/lxc/lxc_driver.c
-@@ -3570,7 +3570,7 @@ lxcDomainAttachDeviceNetLive(virLXCDriver *driver,
-     actualBandwidth = virDomainNetGetActualBandwidth(net);
-     if (actualBandwidth) {
-         if (virNetDevSupportsBandwidth(actualType)) {
-            unsigned int flags = 0;
-+            unsigned int flags = VIR_NETDEV_BANDWIDTH_SET_CLEAR_ALL;
- 
-             if (!virDomainNetTypeSharesHostView(net))
-                 flags |= VIR_NETDEV_BANDWIDTH_SET_DIR_SWAPPED;
-diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
-index 0e689fbb70..081ce03a57 100644
--- a/src/lxc/lxc_process.c
-+++ b/src/lxc/lxc_process.c
-@@ -605,7 +605,7 @@ virLXCProcessSetupInterfaces(virLXCDriver *driver,
-         actualBandwidth = virDomainNetGetActualBandwidth(net);
-         if (actualBandwidth) {
-             if (virNetDevSupportsBandwidth(type)) {
-                unsigned int flags = 0;
-+                unsigned int flags = VIR_NETDEV_BANDWIDTH_SET_CLEAR_ALL;
- 
-                 if (!virDomainNetTypeSharesHostView(net))
-                     flags |= VIR_NETDEV_BANDWIDTH_SET_DIR_SWAPPED;
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index b4815e5e71..ed54fd4c5b 100644
--- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -8841,7 +8841,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver,
-                                                         !virDomainNetTypeSharesHostView(net)) < 0)
-                     goto cleanup;
-             } else {
-                unsigned int flags = 0;
-+                unsigned int flags = VIR_NETDEV_BANDWIDTH_SET_CLEAR_ALL;
- 
-                 if (!virDomainNetTypeSharesHostView(net))
-                     flags |= VIR_NETDEV_BANDWIDTH_SET_DIR_SWAPPED;
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 14929616e5..9549065b1f 100644
--- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -9942,7 +9942,7 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom,
-                 goto endjob;
-             }
-         } else {
-            unsigned int bwflags = 0;
-+            unsigned int bwflags = VIR_NETDEV_BANDWIDTH_SET_CLEAR_ALL;
- 
-             if (!virDomainNetTypeSharesHostView(net))
-                 bwflags |= VIR_NETDEV_BANDWIDTH_SET_DIR_SWAPPED;
-diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
-index d5e7e99359..ceda4119cd 100644
--- a/src/qemu/qemu_hotplug.c
-+++ b/src/qemu/qemu_hotplug.c
-@@ -1280,7 +1280,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver,
-                                                         !virDomainNetTypeSharesHostView(net)) < 0)
-                     goto cleanup;
-             } else {
-                int flags = 0;
-+                int flags = VIR_NETDEV_BANDWIDTH_SET_CLEAR_ALL;
- 
-                 if (!virDomainNetTypeSharesHostView(net))
-                     flags |= VIR_NETDEV_BANDWIDTH_SET_DIR_SWAPPED;
-@@ -4088,7 +4088,7 @@ qemuDomainChangeNet(virQEMUDriver *driver,
-                                                         !virDomainNetTypeSharesHostView(newdev)) < 0)
-                     goto cleanup;
-             } else {
-                int flags = 0;
-+                int flags = VIR_NETDEV_BANDWIDTH_SET_CLEAR_ALL;
- 
-                 if (!virDomainNetTypeSharesHostView(newdev))
-                     flags |= VIR_NETDEV_BANDWIDTH_SET_DIR_SWAPPED;
-diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c
-index 1baad849c6..9c48844c5d 100644
--- a/src/util/virnetdevbandwidth.c
-+++ b/src/util/virnetdevbandwidth.c
-@@ -196,6 +196,21 @@ virNetDevBandwidthManipulateFilter(const char *ifname,
-  *     interface (so domain's RX/TX is host's RX/TX), and for some
-  *     it's swapped (domain's RX/TX is hosts's TX/RX).
-  *
-+ *   VIR_NETDEV_BANDWIDTH_SET_CLEAR_ALL
-+ *     If VIR_NETDEV_BANDWIDTH_SET_CLEAR_ALL is set, then the root
-+ *     qdisc is deleted before adding any new qdisc/class/filter,
-+ *     which causes any pre-existing filters to also be deleted. If
-+ *     not set, then it's assumed that there are no existing rules (or
-+ *     that those already there need to be kept). The caller should
-+ *     set this flag for an existing interface that is having its
-+ *     bandwidth settings modified, but can leave it unset if the
-+ *     interface was newly created and this is the first time
-+ *     bandwidth has been set, but someone else might have already
-+ *     added the qdisc (e.g. this is the case when the network driver
-+ *     is setting bandwidth for a virtual network bridge device - the
-+ *     nftables backend may have already added qdisc handle 1:0 and a
-+ *     filter, and we don't want to delete them)
-+ *
-  * Return 0 on success, -1 otherwise.
-  */
- int
-@@ -238,7 +253,11 @@ virNetDevBandwidthSet(const char *ifname,
-         tx = bandwidth->out;
-     }
- 
-    virNetDevBandwidthClear(ifname);
-+    /* Only if the caller requests, clear everything including root
-+     * qdisc and all filters before adding everything.
-+     */
-+    if (flags & VIR_NETDEV_BANDWIDTH_SET_CLEAR_ALL)
-+        virNetDevBandwidthClear(ifname);
- 
-     if (tx && tx->average) {
-         average = g_strdup_printf("%llukbps", tx->average);
-diff --git a/src/util/virnetdevbandwidth.h b/src/util/virnetdevbandwidth.h
-index 80dc654486..744aa4c826 100644
--- a/src/util/virnetdevbandwidth.h
-+++ b/src/util/virnetdevbandwidth.h
-@@ -42,6 +42,7 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(virNetDevBandwidth, virNetDevBandwidthFree);
- typedef enum {
-     VIR_NETDEV_BANDWIDTH_SET_HIERARCHICAL_CLASS = (1 << 0),
-     VIR_NETDEV_BANDWIDTH_SET_DIR_SWAPPED = (1 << 1),
-+    VIR_NETDEV_BANDWIDTH_SET_CLEAR_ALL = (1 << 2),
- } virNetDevBandwidthSetFlags;
- 
- int virNetDevBandwidthSet(const char *ifname,
-diff --git a/tests/virnetdevbandwidthtest.c b/tests/virnetdevbandwidthtest.c
-index 6529ff4026..6d5c847ad7 100644
--- a/tests/virnetdevbandwidthtest.c
-+++ b/tests/virnetdevbandwidthtest.c
-@@ -82,7 +82,8 @@ testVirNetDevBandwidthSet(const void *data)
-         if (virNetDevOpenvswitchInterfaceSetQos(iface, band, info->uuid, true) < 0)
-             return -1;
-     } else {
-        unsigned int flags = VIR_NETDEV_BANDWIDTH_SET_DIR_SWAPPED;
-+        unsigned int flags = VIR_NETDEV_BANDWIDTH_SET_DIR_SWAPPED |
-+                             VIR_NETDEV_BANDWIDTH_SET_CLEAR_ALL;
- 
-         if (info->hierarchical_class)
-             flags |= VIR_NETDEV_BANDWIDTH_SET_HIERARCHICAL_CLASS;
-- 
-2.47.1
-
@@ -1,98 +0,0 @@
-From faebbbbfa3b1bd4120852b3f416c8073ab82d5c5 Mon Sep 17 00:00:00 2001
-From: Laine Stump <laine@redhat.com>
-Date: Mon, 25 Nov 2024 22:24:46 -0500
-Subject: [PATCH 6/9] util: put the command that adds a tx filter qdisc into a
- separate function
-
-virNetDevBandwidthSet() adds a queue discipline (qdisc) for each
-interface that it will need to add tc transmit filters to, and the
-filters are then attached to the qdisc.
-
-There are other circumstances where some other function will need to
-add tc transmit filters to an interface (in particular an upcoming
-patch to the network driver nftables backend that will use a tc tx
-filter to fix the checksum of dhcp packets), so that function will
-also need a qdisc for the tx filter. To assure both always use exactly
-the same qdisc, this patch puts the command that adds the tx filter
-qdisc into a separate helper function that can (and will) be called
-from either place
-
-Signed-off-by: Laine Stump <laine@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---
- src/libvirt_private.syms      |  1 +
- src/util/virnetdevbandwidth.c | 30 +++++++++++++++++++++++++-----
- src/util/virnetdevbandwidth.h |  3 +++
- 3 files changed, 29 insertions(+), 5 deletions(-)
-
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index d15d6a6a9d..0211cee967 100644
--- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -2859,6 +2859,7 @@ virNetDevVFInterfaceStats;
- 
- 
- # util/virnetdevbandwidth.h
-+virNetDevBandWidthAddTxFilterParentQdisc;
- virNetDevBandwidthClear;
- virNetDevBandwidthCopy;
- virNetDevBandwidthEqual;
-diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c
-index 9c48844c5d..90eebe6576 100644
--- a/src/util/virnetdevbandwidth.c
-+++ b/src/util/virnetdevbandwidth.c
-@@ -266,11 +266,7 @@ virNetDevBandwidthSet(const char *ifname,
-         if (tx->burst)
-             burst = g_strdup_printf("%llukb", tx->burst);
- 
-        cmd = virCommandNew(TC);
-        virCommandAddArgList(cmd, "qdisc", "add", "dev", ifname, "root",
-                             "handle", "1:", "htb", "default",
-                             hierarchical_class ? "2" : "1", NULL);
-        if (virCommandRun(cmd, NULL) < 0)
-+        if (virNetDevBandWidthAddTxFilterParentQdisc(ifname, hierarchical_class) < 0)
-             goto cleanup;
- 
-         /* If we are creating a hierarchical class, all non guaranteed traffic
-@@ -794,3 +790,27 @@ virNetDevBandwidthSetRootQDisc(const char *ifname,
- 
-     return 0;
- }
-+
-+/**
-+ * virNetDevBandwidthAddTxFilterParentQdisc:
-+ * @ifname: name of interface that needs a qdisc to attach tx filters to
-+ * @hierarchical_class: true if hierarchical classes will be used on this interface
-+ *
-+ * Add a root Qdisc (Queueing Discipline) for attaching Tx filters to
-+ * @ifname.
-+ *
-+ * returns 0 on success, -1 on failure
-+ */
-+int
-+virNetDevBandWidthAddTxFilterParentQdisc(const char *ifname,
-+                                         bool hierarchical_class)
-+{
-+    g_autoptr(virCommand) cmd = NULL;
-+
-+    cmd = virCommandNew(TC);
-+    virCommandAddArgList(cmd, "qdisc", "add", "dev", ifname, "root",
-+                         "handle", "1:", "htb", "default",
-+                         hierarchical_class ? "2" : "1", NULL);
-+
-+    return virCommandRun(cmd, NULL);
-+}
-diff --git a/src/util/virnetdevbandwidth.h b/src/util/virnetdevbandwidth.h
-index 744aa4c826..65c1500637 100644
--- a/src/util/virnetdevbandwidth.h
-+++ b/src/util/virnetdevbandwidth.h
-@@ -84,3 +84,6 @@ int virNetDevBandwidthUpdateFilter(const char *ifname,
- int virNetDevBandwidthSetRootQDisc(const char *ifname,
-                                    const char *qdisc)
-     G_NO_INLINE;
-+
-+int virNetDevBandWidthAddTxFilterParentQdisc(const char *ifname,
-+                                             bool hierarchical_class);
-- 
-2.47.1
-
@@ -1,107 +0,0 @@
-From 73c0fb19ce5b816ee81ede691252855c75391c9a Mon Sep 17 00:00:00 2001
-From: Laine Stump <laine@redhat.com>
-Date: Mon, 25 Nov 2024 22:24:47 -0500
-Subject: [PATCH 7/9] util: don't re-add the qdisc used for tx filters if it
- already exists
-
-There will soon be two separate users of tc on virtual networks, and
-both will use the "qdisc root handle 1: htb" to add tx filters. One or the
-other could get the first chance to add the qdisc, and then if at a
-later time the other decides to use it, we need to prevent the 2nd
-user from attempting to re-add the qdisc (because that just generates
-an error).
-
-We do this by running "tc qdisc show dev $bridge handle 1:" then
-checking if the output of that command contains both "qdisc" and " 1:
-".[*] If it does then the qdisc has already been added. If not then we
-need to add it now.
-
-[*]As of this writing, the output more exactly starts with "qdisc
-htb 1: root", but our comparison is made purposefully generous to
-increase the chances that it will continue to work properly if tc
-modifies the format of its output.
-
-Signed-off-by: Laine Stump <laine@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---
- src/util/virnetdevbandwidth.c  | 35 ++++++++++++++++++++++++++++------
- tests/virnetdevbandwidthtest.c |  3 +++
- 2 files changed, 32 insertions(+), 6 deletions(-)
-
-diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c
-index 90eebe6576..5c6a65528c 100644
--- a/src/util/virnetdevbandwidth.c
-+++ b/src/util/virnetdevbandwidth.c
-@@ -805,12 +805,35 @@ int
- virNetDevBandWidthAddTxFilterParentQdisc(const char *ifname,
-                                          bool hierarchical_class)
- {
-    g_autoptr(virCommand) cmd = NULL;
-+    g_autoptr(virCommand) testCmd = NULL;
-+    g_autofree char *testResult = NULL;
- 
-    cmd = virCommandNew(TC);
-    virCommandAddArgList(cmd, "qdisc", "add", "dev", ifname, "root",
-                         "handle", "1:", "htb", "default",
-                         hierarchical_class ? "2" : "1", NULL);
-+    /* first check it the qdisc with handle 1: was already added for
-+     * this interface by someone else
-+     */
-+    testCmd = virCommandNew(TC);
-+    virCommandAddArgList(testCmd, "qdisc", "show", "dev", ifname,
-+                         "handle", "1:", NULL);
-+    virCommandSetOutputBuffer(testCmd, &testResult);
- 
-    return virCommandRun(cmd, NULL);
-+    if (virCommandRun(testCmd, NULL) < 0)
-+        return -1;
-+
-+    /* output will be something like: "qdisc htb 1: root refcnt ..."
-+     * if the qdisc was already added. We just search for "qdisc" and
-+     * " 1: " anywhere in the output to allow for tc changing its
-+     * output format.
-+     */
-+    if (!(testResult && strstr(testResult, "qdisc") && strstr(testResult, " 1: "))) {
-+        /* didn't find qdisc in output, so we need to add one */
-+        g_autoptr(virCommand) addCmd = virCommandNew(TC);
-+
-+        virCommandAddArgList(addCmd, "qdisc", "add", "dev", ifname, "root",
-+                             "handle", "1:", "htb", "default",
-+                             hierarchical_class ? "2" : "1", NULL);
-+
-+        return virCommandRun(addCmd, NULL);
-+    }
-+
-+    return 0;
- }
-diff --git a/tests/virnetdevbandwidthtest.c b/tests/virnetdevbandwidthtest.c
-index 6d5c847ad7..31aa7f469d 100644
--- a/tests/virnetdevbandwidthtest.c
-+++ b/tests/virnetdevbandwidthtest.c
-@@ -147,6 +147,7 @@ mymain(void)
-                 "</bandwidth>",
-                 TC " qdisc del dev eth0 root\n"
-                 TC " qdisc del dev eth0 ingress\n"
-+                TC " qdisc show dev eth0 handle 1:\n"
-                 TC " qdisc add dev eth0 root handle 1: htb default 1\n"
-                 TC " class add dev eth0 parent 1: classid 1:1 htb rate 1024kbps quantum 87\n"
-                 TC " qdisc add dev eth0 parent 1:1 handle 2: sfq perturb 10\n"
-@@ -177,6 +178,7 @@ mymain(void)
-                 "</bandwidth>",
-                 TC " qdisc del dev eth0 root\n"
-                 TC " qdisc del dev eth0 ingress\n"
-+                TC " qdisc show dev eth0 handle 1:\n"
-                 TC " qdisc add dev eth0 root handle 1: htb default 1\n"
-                 TC " class add dev eth0 parent 1: classid 1:1 htb rate 1kbps ceil 2kbps burst 4kb quantum 1\n"
-                 TC " qdisc add dev eth0 parent 1:1 handle 2: sfq perturb 10\n"
-@@ -199,6 +201,7 @@ mymain(void)
-                 "</bandwidth>",
-                 TC " qdisc del dev eth0 root\n"
-                 TC " qdisc del dev eth0 ingress\n"
-+                TC " qdisc show dev eth0 handle 1:\n"
-                 TC " qdisc add dev eth0 root handle 1: htb default 1\n"
-                 TC " class add dev eth0 parent 1: classid 1:1 htb rate 4294967295kbps quantum 366503875\n"
-                 TC " qdisc add dev eth0 parent 1:1 handle 2: sfq perturb 10\n"
-- 
-2.47.1
-
@@ -1,171 +0,0 @@
-From dac9cb9030ac03d18f59884864a0a253e3c9f8f1 Mon Sep 17 00:00:00 2001
-From: Laine Stump <laine@redhat.com>
-Date: Mon, 25 Nov 2024 22:24:48 -0500
-Subject: [PATCH 8/9] util: add new "tc" layer for virFirewallCmd objects
-
-If the layer of a virFirewallCmd is "tc", then the "tc" utility will
-be executed using the arguments that had been added to the
-virFirewallCmd
-
-tc layer doesn't support auto-rollback command creation (any rollback
-needs to be added manually with virFirewallAddRollbackCmd()), and also
-tc layer isn't supported by the iptables backend (it would have been
-straightforward to add, but the iptables backend doesn't need it, and
-I didn't want to take the chance of causing a regression in that
-code for no good reason).
-
-Signed-off-by: Laine Stump <laine@redhat.com>
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---
- src/network/network_nftables.c |  1 +
- src/util/virfirewall.c         | 66 +++++++++++++++++++++-------------
- src/util/virfirewall.h         |  1 +
- src/util/virfirewalld.c        |  1 +
- 4 files changed, 44 insertions(+), 25 deletions(-)
-
-diff --git a/src/network/network_nftables.c b/src/network/network_nftables.c
-index 268d1f12ca..cc184105c3 100644
--- a/src/network/network_nftables.c
-+++ b/src/network/network_nftables.c
-@@ -73,6 +73,7 @@ VIR_ENUM_IMPL(nftablesLayer,
-               "",
-               "ip",
-               "ip6",
-+              "",
- );
- 
- 
-diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c
-index 811b787ecc..9389bcf541 100644
--- a/src/util/virfirewall.c
-+++ b/src/util/virfirewall.c
-@@ -47,6 +47,7 @@ VIR_ENUM_IMPL(virFirewallLayer,
-               "ethernet",
-               "ipv4",
-               "ipv6",
-+              "tc",
- );
- 
- typedef struct _virFirewallGroup virFirewallGroup;
-@@ -57,6 +58,7 @@ VIR_ENUM_IMPL(virFirewallLayerCommand,
-               EBTABLES,
-               IPTABLES,
-               IP6TABLES,
-+              TC,
- );
- 
- struct _virFirewallCmd {
-@@ -591,6 +593,7 @@ virFirewallCmdIptablesApply(virFirewall *firewall,
-     case VIR_FIREWALL_LAYER_IPV6:
-         virCommandAddArg(cmd, "-w");
-         break;
-+    case VIR_FIREWALL_LAYER_TC:
-     case VIR_FIREWALL_LAYER_LAST:
-         break;
-     }
-@@ -672,39 +675,52 @@ virFirewallCmdNftablesApply(virFirewall *firewall G_GNUC_UNUSED,
-     size_t i;
-     int status;
- 
-    cmd = virCommandNew(NFT);
-+    if (fwCmd->layer == VIR_FIREWALL_LAYER_TC) {
- 
-    if ((virFirewallTransactionGetFlags(firewall) & VIR_FIREWALL_TRANSACTION_AUTO_ROLLBACK) &&
-        fwCmd->argsLen > 1) {
-        /* skip any leading options to get to command verb */
-        for (i = 0; i < fwCmd->argsLen - 1; i++) {
-            if (fwCmd->args[i][0] != '-')
-                break;
-        }
-+        /* for VIR_FIREWALL_LAYER_TC, we run the 'tc' (traffic control) command with
-+         * the supplied args.
-+         */
-+        cmd = virCommandNew(TC);
- 
-        if (i + 1 < fwCmd->argsLen &&
-            VIR_NFTABLES_ARG_IS_CREATE(fwCmd->args[i])) {
-+        /* NB: RAW commands don't support auto-rollback command creation */
- 
-            cmdIdx = i;
-            objectType = fwCmd->args[i + 1];
-+    } else {
- 
-            /* we currently only handle auto-rollback for rules,
-             * chains, and tables, and those all can be "rolled
-             * back" by a delete command using the handle that is
-             * returned when "-ae" is added to the add/insert
-             * command.
-             */
-            if (STREQ_NULLABLE(objectType, "rule") ||
-                STREQ_NULLABLE(objectType, "chain") ||
-                STREQ_NULLABLE(objectType, "table")) {
-+        cmd = virCommandNew(NFT);
- 
-                needRollback = true;
-                /* this option to nft instructs it to add the
-                 * "handle" of the created object to stdout
-+        if ((virFirewallTransactionGetFlags(firewall) & VIR_FIREWALL_TRANSACTION_AUTO_ROLLBACK) &&
-+            fwCmd->argsLen > 1) {
-+            /* skip any leading options to get to command verb */
-+            for (i = 0; i < fwCmd->argsLen - 1; i++) {
-+                if (fwCmd->args[i][0] != '-')
-+                    break;
-+            }
-+
-+            if (i + 1 < fwCmd->argsLen &&
-+                VIR_NFTABLES_ARG_IS_CREATE(fwCmd->args[i])) {
-+
-+                cmdIdx = i;
-+                objectType = fwCmd->args[i + 1];
-+
-+                /* we currently only handle auto-rollback for rules,
-+                 * chains, and tables, and those all can be "rolled
-+                 * back" by a delete command using the handle that is
-+                 * returned when "-ae" is added to the add/insert
-+                 * command.
-                  */
-                virCommandAddArg(cmd, "-ae");
-+                if (STREQ_NULLABLE(objectType, "rule") ||
-+                    STREQ_NULLABLE(objectType, "chain") ||
-+                    STREQ_NULLABLE(objectType, "table")) {
-+
-+                    needRollback = true;
-+                    /* this option to nft instructs it to add the
-+                     * "handle" of the created object to stdout
-+                     */
-+                    virCommandAddArg(cmd, "-ae");
-+                }
-             }
-         }
-+
-     }
- 
-     for (i = 0; i < fwCmd->argsLen; i++)
-diff --git a/src/util/virfirewall.h b/src/util/virfirewall.h
-index bce51259d2..d42e60884b 100644
--- a/src/util/virfirewall.h
-+++ b/src/util/virfirewall.h
-@@ -39,6 +39,7 @@ typedef enum {
-     VIR_FIREWALL_LAYER_ETHERNET,
-     VIR_FIREWALL_LAYER_IPV4,
-     VIR_FIREWALL_LAYER_IPV6,
-+    VIR_FIREWALL_LAYER_TC,
- 
-     VIR_FIREWALL_LAYER_LAST,
- } virFirewallLayer;
-diff --git a/src/util/virfirewalld.c b/src/util/virfirewalld.c
-index 827e201dbb..124523c420 100644
--- a/src/util/virfirewalld.c
-+++ b/src/util/virfirewalld.c
-@@ -43,6 +43,7 @@ VIR_LOG_INIT("util.firewalld");
- VIR_ENUM_DECL(virFirewallLayerFirewallD);
- VIR_ENUM_IMPL(virFirewallLayerFirewallD,
-               VIR_FIREWALL_LAYER_LAST,
-+              "",
-               "eb",
-               "ipv4",
-               "ipv6",
-- 
-2.47.1
-
@@ -1,687 +0,0 @@
-From b1e2318a0d609fcdff04fcf88953ea87cdd02b95 Mon Sep 17 00:00:00 2001
-From: Laine Stump <laine@redhat.com>
-Date: Mon, 25 Nov 2024 22:24:49 -0500
-Subject: [PATCH 9/9] network: add tc filter rule to nftables backend to fix
- checksum of DHCP responses
-
-Please see the commit log for commit v10.9.0-rc1-1-g42ab0148dd for the
-history and explanation of the problem that this patch is fixing.
-
-A shorter explanation is that when a guest is connected to a libvirt
-virtual network using a virtio-net adapter with in-kernel "vhost-net"
-packet processing enabled, it will fail to acquire an IP address from
-a DHCP seever running on the host.
-
-In commit v10.9.0-rc1-1-g42ab0148dd we tried fixing this by *zeroing
-out* the checksums of these packets with an nftables rule (nftables
-can't recompute the checksum, but it can set it to 0) . This
-*appeared* to work initially, but it turned out that zeroing the
-checksum ends up breaking dhcp packets on *non* virtio/vhost-net guest
-interfaces. That attempt was reverted in commit v10.9.0-rc2.
-
-Fortunately, there is an existing way to recompute the checksum of a
-packet as it leaves an interface - the "tc" (traffic control) utility
-that libvirt already uses for bandwidth management. This patch uses a
-tc filter rule to match dhcp response packets on the bridge and
-recompute their checksum.
-
-The filter rule must be attached to a tc qdisc, which may also have a
-filter attached for bandwidth management (in the <bandwidth> element
-of the network config). Not only must we add the qdisc only once
-(which was already handled by the patch two prior to this one), but
-also the filter rule for checksum fixing and the filter rule for
-bandwidth management must be different priorities so they don't clash;
-this is solved by adding the checksum-fix filter with "priority 2",
-while the bandwidth management filter remains "priority 1" (both will
-always be evaluated anyway, it's just a matter of which is evaluated
-first).
-
-So far this method has worked with every different guest we could
-throw at it, including several that failed with the previous method.
-
-Fixes: b89c4991daa0ee9371f10937fab3b03c5ffdabc6
-Reported-by: Rich Jones <rjones@redhat.com>
-Reported-by: Andrea Bolognani <abologna@redhat.com>
-Fix-Suggested-by: Eric Garver <egarver@redhat.com>
-Fix-Suggested-by: Phil Sutter <psutter@redhat.com>
-Signed-off-by: Laine Stump <laine@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---
- src/network/network_nftables.c                | 68 +++++++++++++++++++
- .../forward-dev-linux.nftables                | 40 +++++++++++
- .../isolated-linux.nftables                   | 40 +++++++++++
- .../nat-default-linux.nftables                | 40 +++++++++++
- .../nat-ipv6-linux.nftables                   | 40 +++++++++++
- .../nat-ipv6-masquerade-linux.nftables        | 40 +++++++++++
- .../nat-many-ips-linux.nftables               | 40 +++++++++++
- .../nat-no-dhcp-linux.nftables                | 40 +++++++++++
- .../nat-port-range-ipv6-linux.nftables        | 40 +++++++++++
- .../nat-port-range-linux.nftables             | 40 +++++++++++
- .../nat-tftp-linux.nftables                   | 40 +++++++++++
- .../route-default-linux.nftables              | 40 +++++++++++
- 12 files changed, 508 insertions(+)
-
-diff --git a/src/network/network_nftables.c b/src/network/network_nftables.c
-index cc184105c3..748edb0273 100644
--- a/src/network/network_nftables.c
-+++ b/src/network/network_nftables.c
-@@ -29,6 +29,7 @@
- 
- #include "internal.h"
- #include "virfirewalld.h"
-+#include "vircommand.h"
- #include "virerror.h"
- #include "virlog.h"
- #include "virhash.h"
-@@ -924,6 +925,67 @@ nftablesAddIPSpecificFirewallRules(virFirewall *fw,
- }
- 
- 
-+/**
-+ * nftablesAddUdpChecksumFixWithTC:
-+ *
-+ * Add a tc filter rule to @ifname (the bridge device of this network)
-+ * that will recompute the checksum of udp packets output from @iface with
-+ * destination port @port.
-+ *
-+ * Normally the checksum should be filled by some part of the basic
-+ * network stack, but there are cases (e.g. DHCP response packets sent
-+ * from virtualization host to a QEMU guest when the guest NIC uses
-+ * vhost-net packet processing) when the host (sender) thinks that
-+ * packet checksums will be computed elsewhere (and so leaves a
-+ * partially computed checksum in the packet header) while the guest
-+ * (receiver) thinks that the checksum has already been fully
-+ * computed; in the meantime none of the code in between has actually
-+ * finished computing the checksum.
-+ *
-+ * An example of this is DHCP response packets from host to guest. If
-+ * the checksum of each of these packets isn't properly computed, then
-+ * many guests (e.g. FreeBSD) will drop them with reason BAD CHECKSUM;
-+ * this tc filter rule will fix the ip and udp checksums, and the
-+ * FreeBSD dhcp client will happily accept the packet.
-+ *
-+ * (NB: if you're wondering how the tc qdisc and filter are removed
-+ * when the network is destroyed, the answer is that the kernel
-+ * automatically (and properly) removes them for us, so we don't need
-+ * to worry about keeping track/deleting as we do with nftables rules)
-+ */
-+static int
-+nftablesAddUdpChecksumFixWithTC(virFirewall *fw,
-+                                const char *iface,
-+                                int port)
-+{
-+    g_autofree char *portstr = g_strdup_printf("%d", port);
-+
-+    /* this will add the qdisc (that the filter below is attached to)
-+     * unless it already exists
-+     */
-+    if (virNetDevBandWidthAddTxFilterParentQdisc(iface, true) < 0)
-+        return -1;
-+
-+    /* add a filter to catch all udp packets with dst "port" and
-+     * recompute their checksum
-+     */
-+    virFirewallAddCmd(fw, VIR_FIREWALL_LAYER_TC,
-+                      "filter", "add", "dev", iface,
-+                      "prio", "2", "protocol", "ip", "parent", "1:",
-+                      "u32", "match", "ip", "dport", portstr, "ffff",
-+                      "action", "csum", "ip", "and", "udp",
-+                      NULL);
-+
-+    virFirewallAddRollbackCmd(fw, VIR_FIREWALL_LAYER_TC,
-+                              "filter", "del", "dev", iface,
-+                              "prio", "2", "protocol", "ip", "parent", "1:",
-+                              "u32", "match", "ip", "dport", portstr, "ffff",
-+                              "action", "csum", "ip", "and", "udp",
-+                              NULL);
-+    return 0;
-+}
-+
-+
- /* nftablesAddFirewallrules:
-  *
-  * @def - the network that needs an nftables firewall added
-@@ -944,6 +1006,12 @@ nftablesAddFirewallRules(virNetworkDef *def, virFirewall **fwRemoval)
- 
-     virFirewallStartTransaction(fw, VIR_FIREWALL_TRANSACTION_AUTO_ROLLBACK);
- 
-+    /* add the tc filter rule needed to fixup the checksum of dhcp
-+     * response packets going from host to guest.
-+     */
-+    if (nftablesAddUdpChecksumFixWithTC(fw, def->bridge, 68) < 0)
-+        return -1;
-+
-     nftablesAddGeneralFirewallRules(fw, def);
- 
-     for (i = 0;
-diff --git a/tests/networkxml2firewalldata/forward-dev-linux.nftables b/tests/networkxml2firewalldata/forward-dev-linux.nftables
-index 8badb74beb..6772383b37 100644
--- a/tests/networkxml2firewalldata/forward-dev-linux.nftables
-+++ b/tests/networkxml2firewalldata/forward-dev-linux.nftables
-@@ -1,3 +1,43 @@
-+tc \
-+qdisc \
-+show \
-+dev \
-+virbr0 \
-+handle \
-+1:
-+tc \
-+qdisc \
-+add \
-+dev \
-+virbr0 \
-+root \
-+handle \
-+1: \
-+htb \
-+default \
-+2
-+tc \
-+filter \
-+add \
-+dev \
-+virbr0 \
-+prio \
-+2 \
-+protocol \
-+ip \
-+parent \
-+1: \
-+u32 \
-+match \
-+ip \
-+dport \
-+68 \
-+ffff \
-+action \
-+csum \
-+ip \
-+and \
-+udp
- nft \
- -ae insert \
- rule \
-diff --git a/tests/networkxml2firewalldata/isolated-linux.nftables b/tests/networkxml2firewalldata/isolated-linux.nftables
-index d1b4dac178..546a18b75a 100644
--- a/tests/networkxml2firewalldata/isolated-linux.nftables
-+++ b/tests/networkxml2firewalldata/isolated-linux.nftables
-@@ -1,3 +1,43 @@
-+tc \
-+qdisc \
-+show \
-+dev \
-+virbr0 \
-+handle \
-+1:
-+tc \
-+qdisc \
-+add \
-+dev \
-+virbr0 \
-+root \
-+handle \
-+1: \
-+htb \
-+default \
-+2
-+tc \
-+filter \
-+add \
-+dev \
-+virbr0 \
-+prio \
-+2 \
-+protocol \
-+ip \
-+parent \
-+1: \
-+u32 \
-+match \
-+ip \
-+dport \
-+68 \
-+ffff \
-+action \
-+csum \
-+ip \
-+and \
-+udp
- nft \
- -ae insert \
- rule \
-diff --git a/tests/networkxml2firewalldata/nat-default-linux.nftables b/tests/networkxml2firewalldata/nat-default-linux.nftables
-index 28508292f9..08623c1381 100644
--- a/tests/networkxml2firewalldata/nat-default-linux.nftables
-+++ b/tests/networkxml2firewalldata/nat-default-linux.nftables
-@@ -1,3 +1,43 @@
-+tc \
-+qdisc \
-+show \
-+dev \
-+virbr0 \
-+handle \
-+1:
-+tc \
-+qdisc \
-+add \
-+dev \
-+virbr0 \
-+root \
-+handle \
-+1: \
-+htb \
-+default \
-+2
-+tc \
-+filter \
-+add \
-+dev \
-+virbr0 \
-+prio \
-+2 \
-+protocol \
-+ip \
-+parent \
-+1: \
-+u32 \
-+match \
-+ip \
-+dport \
-+68 \
-+ffff \
-+action \
-+csum \
-+ip \
-+and \
-+udp
- nft \
- -ae insert \
- rule \
-diff --git a/tests/networkxml2firewalldata/nat-ipv6-linux.nftables b/tests/networkxml2firewalldata/nat-ipv6-linux.nftables
-index d8a9ba706d..3fd6b94eef 100644
--- a/tests/networkxml2firewalldata/nat-ipv6-linux.nftables
-+++ b/tests/networkxml2firewalldata/nat-ipv6-linux.nftables
-@@ -1,3 +1,43 @@
-+tc \
-+qdisc \
-+show \
-+dev \
-+virbr0 \
-+handle \
-+1:
-+tc \
-+qdisc \
-+add \
-+dev \
-+virbr0 \
-+root \
-+handle \
-+1: \
-+htb \
-+default \
-+2
-+tc \
-+filter \
-+add \
-+dev \
-+virbr0 \
-+prio \
-+2 \
-+protocol \
-+ip \
-+parent \
-+1: \
-+u32 \
-+match \
-+ip \
-+dport \
-+68 \
-+ffff \
-+action \
-+csum \
-+ip \
-+and \
-+udp
- nft \
- -ae insert \
- rule \
-diff --git a/tests/networkxml2firewalldata/nat-ipv6-masquerade-linux.nftables b/tests/networkxml2firewalldata/nat-ipv6-masquerade-linux.nftables
-index a7f09cda59..2811e098d1 100644
--- a/tests/networkxml2firewalldata/nat-ipv6-masquerade-linux.nftables
-+++ b/tests/networkxml2firewalldata/nat-ipv6-masquerade-linux.nftables
-@@ -1,3 +1,43 @@
-+tc \
-+qdisc \
-+show \
-+dev \
-+virbr0 \
-+handle \
-+1:
-+tc \
-+qdisc \
-+add \
-+dev \
-+virbr0 \
-+root \
-+handle \
-+1: \
-+htb \
-+default \
-+2
-+tc \
-+filter \
-+add \
-+dev \
-+virbr0 \
-+prio \
-+2 \
-+protocol \
-+ip \
-+parent \
-+1: \
-+u32 \
-+match \
-+ip \
-+dport \
-+68 \
-+ffff \
-+action \
-+csum \
-+ip \
-+and \
-+udp
- nft \
- -ae insert \
- rule \
-diff --git a/tests/networkxml2firewalldata/nat-many-ips-linux.nftables b/tests/networkxml2firewalldata/nat-many-ips-linux.nftables
-index b826fe6134..5409d5b552 100644
--- a/tests/networkxml2firewalldata/nat-many-ips-linux.nftables
-+++ b/tests/networkxml2firewalldata/nat-many-ips-linux.nftables
-@@ -1,3 +1,43 @@
-+tc \
-+qdisc \
-+show \
-+dev \
-+virbr0 \
-+handle \
-+1:
-+tc \
-+qdisc \
-+add \
-+dev \
-+virbr0 \
-+root \
-+handle \
-+1: \
-+htb \
-+default \
-+2
-+tc \
-+filter \
-+add \
-+dev \
-+virbr0 \
-+prio \
-+2 \
-+protocol \
-+ip \
-+parent \
-+1: \
-+u32 \
-+match \
-+ip \
-+dport \
-+68 \
-+ffff \
-+action \
-+csum \
-+ip \
-+and \
-+udp
- nft \
- -ae insert \
- rule \
-diff --git a/tests/networkxml2firewalldata/nat-no-dhcp-linux.nftables b/tests/networkxml2firewalldata/nat-no-dhcp-linux.nftables
-index d8a9ba706d..3fd6b94eef 100644
--- a/tests/networkxml2firewalldata/nat-no-dhcp-linux.nftables
-+++ b/tests/networkxml2firewalldata/nat-no-dhcp-linux.nftables
-@@ -1,3 +1,43 @@
-+tc \
-+qdisc \
-+show \
-+dev \
-+virbr0 \
-+handle \
-+1:
-+tc \
-+qdisc \
-+add \
-+dev \
-+virbr0 \
-+root \
-+handle \
-+1: \
-+htb \
-+default \
-+2
-+tc \
-+filter \
-+add \
-+dev \
-+virbr0 \
-+prio \
-+2 \
-+protocol \
-+ip \
-+parent \
-+1: \
-+u32 \
-+match \
-+ip \
-+dport \
-+68 \
-+ffff \
-+action \
-+csum \
-+ip \
-+and \
-+udp
- nft \
- -ae insert \
- rule \
-diff --git a/tests/networkxml2firewalldata/nat-port-range-ipv6-linux.nftables b/tests/networkxml2firewalldata/nat-port-range-ipv6-linux.nftables
-index ceaed6fa40..d74417cdb3 100644
--- a/tests/networkxml2firewalldata/nat-port-range-ipv6-linux.nftables
-+++ b/tests/networkxml2firewalldata/nat-port-range-ipv6-linux.nftables
-@@ -1,3 +1,43 @@
-+tc \
-+qdisc \
-+show \
-+dev \
-+virbr0 \
-+handle \
-+1:
-+tc \
-+qdisc \
-+add \
-+dev \
-+virbr0 \
-+root \
-+handle \
-+1: \
-+htb \
-+default \
-+2
-+tc \
-+filter \
-+add \
-+dev \
-+virbr0 \
-+prio \
-+2 \
-+protocol \
-+ip \
-+parent \
-+1: \
-+u32 \
-+match \
-+ip \
-+dport \
-+68 \
-+ffff \
-+action \
-+csum \
-+ip \
-+and \
-+udp
- nft \
- -ae insert \
- rule \
-diff --git a/tests/networkxml2firewalldata/nat-port-range-linux.nftables b/tests/networkxml2firewalldata/nat-port-range-linux.nftables
-index 1dc37a26ec..b55bb287a9 100644
--- a/tests/networkxml2firewalldata/nat-port-range-linux.nftables
-+++ b/tests/networkxml2firewalldata/nat-port-range-linux.nftables
-@@ -1,3 +1,43 @@
-+tc \
-+qdisc \
-+show \
-+dev \
-+virbr0 \
-+handle \
-+1:
-+tc \
-+qdisc \
-+add \
-+dev \
-+virbr0 \
-+root \
-+handle \
-+1: \
-+htb \
-+default \
-+2
-+tc \
-+filter \
-+add \
-+dev \
-+virbr0 \
-+prio \
-+2 \
-+protocol \
-+ip \
-+parent \
-+1: \
-+u32 \
-+match \
-+ip \
-+dport \
-+68 \
-+ffff \
-+action \
-+csum \
-+ip \
-+and \
-+udp
- nft \
- -ae insert \
- rule \
-diff --git a/tests/networkxml2firewalldata/nat-tftp-linux.nftables b/tests/networkxml2firewalldata/nat-tftp-linux.nftables
-index 28508292f9..08623c1381 100644
--- a/tests/networkxml2firewalldata/nat-tftp-linux.nftables
-+++ b/tests/networkxml2firewalldata/nat-tftp-linux.nftables
-@@ -1,3 +1,43 @@
-+tc \
-+qdisc \
-+show \
-+dev \
-+virbr0 \
-+handle \
-+1:
-+tc \
-+qdisc \
-+add \
-+dev \
-+virbr0 \
-+root \
-+handle \
-+1: \
-+htb \
-+default \
-+2
-+tc \
-+filter \
-+add \
-+dev \
-+virbr0 \
-+prio \
-+2 \
-+protocol \
-+ip \
-+parent \
-+1: \
-+u32 \
-+match \
-+ip \
-+dport \
-+68 \
-+ffff \
-+action \
-+csum \
-+ip \
-+and \
-+udp
- nft \
- -ae insert \
- rule \
-diff --git a/tests/networkxml2firewalldata/route-default-linux.nftables b/tests/networkxml2firewalldata/route-default-linux.nftables
-index 282c9542a5..76d6902517 100644
--- a/tests/networkxml2firewalldata/route-default-linux.nftables
-+++ b/tests/networkxml2firewalldata/route-default-linux.nftables
-@@ -1,3 +1,43 @@
-+tc \
-+qdisc \
-+show \
-+dev \
-+virbr0 \
-+handle \
-+1:
-+tc \
-+qdisc \
-+add \
-+dev \
-+virbr0 \
-+root \
-+handle \
-+1: \
-+htb \
-+default \
-+2
-+tc \
-+filter \
-+add \
-+dev \
-+virbr0 \
-+prio \
-+2 \
-+protocol \
-+ip \
-+parent \
-+1: \
-+u32 \
-+match \
-+ip \
-+dport \
-+68 \
-+ffff \
-+action \
-+csum \
-+ip \
-+and \
-+udp
- nft \
- -ae insert \
- rule \
-- 
-2.47.1
-
@@ -1,51 +0,0 @@
-From 114c0ec656e879ab4d67919914bb24cf5993106d Mon Sep 17 00:00:00 2001
-Message-ID: <114c0ec656e879ab4d67919914bb24cf5993106d.1734201785.git.crobinso@redhat.com>
-From: Laine Stump <laine@redhat.com>
-Date: Mon, 2 Sep 2024 16:13:08 -0400
-Subject: [PATCH] network: permit <forward mode='open'/> when a network has no
- IP address
-Content-type: text/plain
-
-The whole point of <forward mode='open'/> is to supress libvirt from
-adding any firewall rules for a network, and someone might want to
-create a network with no IP address (i.e. they don't want the guests
-to have connectivity to the host via this interface) and no firewall
-rules (they don't want any, or they want to add their own). So there's
-no reason to fail when a network has <forward mode='open'/> and also
-has no IP address.
-
-Kind-of-Resolves: https://gitlab.com/libvirt/libvirt/-/issues/588
-Signed-off-by: Laine Stump <laine@redhat.com>
-Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
-Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
- src/conf/network_conf.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
-index 5cf419acf1..320e1b089a 100644
--- a/src/conf/network_conf.c
-+++ b/src/conf/network_conf.c
-@@ -1789,7 +1789,6 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt,
- 
-     case VIR_NETWORK_FORWARD_ROUTE:
-     case VIR_NETWORK_FORWARD_NAT:
-    case VIR_NETWORK_FORWARD_OPEN:
-         /* It's pointless to specify L3 forwarding without specifying
-          * the network we're on.
-          */
-@@ -1806,8 +1805,10 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt,
-                            def->name);
-             return NULL;
-         }
-+        break;
- 
-        if (def->forward.type == VIR_NETWORK_FORWARD_OPEN && def->forward.nifs) {
-+    case VIR_NETWORK_FORWARD_OPEN:
-+        if (def->forward.nifs) {
-             /* an open network by definition can't place any restrictions
-              * on what traffic is allowed or where it goes, so specifying
-              * a forwarding device is nonsensical.
-- 
-2.47.1
-
@@ -1,64 +0,0 @@
-From d51179fa82448f4720f1645f0b7100df80508cc4 Mon Sep 17 00:00:00 2001
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Thu, 9 Jan 2025 16:23:44 +0100
-Subject: [PATCH] qemu: snapshot: delete disk image only if parent snapshot is
- external
-Content-type: text/plain
-
-When we are deleting external snapshot that is not active we only need
-to delete overlay disk image of the parent snapshot. This works
-correctly even if parent snapshot is external and active as it will have
-another overlay created when user reverted to that snapshot.
-
-In case the parent snapshot is internal there are no overlay disk images
-created as everything is stored internally within the disk image. In
-this case we would delete the actual disk image storing internal
-snapshots and most likely the original disk image as well resulting in
-data loss once the VM is shutoff.
-
-Fixes: https://gitlab.com/libvirt/libvirt/-/issues/734
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
---
- src/qemu/qemu_snapshot.c | 14 ++++++++------
- 1 file changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c
-index 18b2e478f6..80cd54bf33 100644
--- a/src/qemu/qemu_snapshot.c
-+++ b/src/qemu/qemu_snapshot.c
-@@ -3144,6 +3144,8 @@ qemuSnapshotDeleteExternalPrepareData(virDomainObj *vm,
-             return -1;
-         }
- 
-+        data->parentSnap = qemuSnapshotFindParentSnapForDisk(snap, data->snapDisk);
-+
-         if (data->merge) {
-             virStorageSource *snapDiskSrc = NULL;
- 
-@@ -3185,8 +3187,6 @@ qemuSnapshotDeleteExternalPrepareData(virDomainObj *vm,
-                 qemuSnapshotGetDisksWithBackingStore(vm, snap, data);
-             }
- 
-            data->parentSnap = qemuSnapshotFindParentSnapForDisk(snap, data->snapDisk);
-
-             if (data->parentSnap && !virDomainSnapshotIsExternal(data->parentSnap)) {
-                 virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
-                                _("deleting external snapshot that has internal snapshot as parent not supported"));
-@@ -3642,10 +3642,12 @@ qemuSnapshotDiscardExternal(virDomainObj *vm,
-             if (!data->job)
-                 goto error;
-         } else {
-            if (virStorageSourceInit(data->parentDomDisk->src) < 0 ||
-                virStorageSourceUnlink(data->parentDomDisk->src) < 0) {
-                VIR_WARN("Failed to remove snapshot image '%s'",
-                         data->snapDisk->name);
-+            if (data->parentSnap && virDomainSnapshotIsExternal(data->parentSnap)) {
-+                if (virStorageSourceInit(data->parentDomDisk->src) < 0 ||
-+                    virStorageSourceUnlink(data->parentDomDisk->src) < 0) {
-+                    VIR_WARN("Failed to remove snapshot image '%s'",
-+                             data->snapDisk->name);
-+                }
-             }
-         }
-     }
@@ -0,0 +1,21 @@
+# 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)
@@ -0,0 +1 @@
+F-13
@@ -0,0 +1,163 @@
+commit 377bc412ce10845930346744e30fe9c4790e5e63
+Author: Cole Robinson <crobinso@redhat.com>
+Date:   Wed May 19 16:03:52 2010 -0400
+
+    daemon: Export SDL audio environment variables
+    
+    /etc/sysconfig/libvirtd has a few environment variables for configuring
+    libvirt SDL audio. The libvirtd process doesn't see these, however, because
+    they are never exported. Let's export the variables after sourcing the
+    sysconfig script.
+    
+    There is another problem here that the commented out values in the
+    sysconfig script are not neccessarily the actual defaults, we are qemus
+    mercy here. Not sure how to solve that.
+
+diff --git a/daemon/libvirtd.init.in b/daemon/libvirtd.init.in
+index 809433e..aa7870c 100644
+--- a/daemon/libvirtd.init.in
+++ b/daemon/libvirtd.init.in
+@@ -45,6 +45,9 @@ KRB5_KTNAME=/etc/libvirt/krb5.tab
+ 
+ test -f @sysconfdir@/sysconfig/libvirtd && . @sysconfdir@/sysconfig/libvirtd
+ 
+export QEMU_AUDIO_DRV
+export SDL_AUDIODRIVER
+
+ LIBVIRTD_CONFIG_ARGS=
+ if [ -n "$LIBVIRTD_CONFIG" ]
+ then
+commit 7f44743c524faa493d05eaf026f1e90a807e502b
+Author: Cole Robinson <crobinso@redhat.com>
+Date:   Wed May 26 10:51:36 2010 -0400
+
+    daemon: sysconf: Update comment about VNC audio
+
+diff --git a/daemon/libvirtd.sysconf b/daemon/libvirtd.sysconf
+index 28080a0..b730c5e 100644
+--- a/daemon/libvirtd.sysconf
+++ b/daemon/libvirtd.sysconf
+@@ -11,7 +11,8 @@
+ # Override the QEMU/SDL default audio driver probing when
+ # starting virtual machines using SDL graphics
+ #
+-# NB these have no effect for VMs using VNC
+# NB these have no effect for VMs using VNC, unless vnc_allow_host_audio
+# is enabled in /etc/libvirt/qemu.conf
+ #QEMU_AUDIO_DRV=sdl
+ #
+ #SDL_AUDIODRIVER=pulse
+commit fb3ebd0397980ae035e66f0008b09e13377ef80f
+Author: Cole Robinson <crobinso@redhat.com>
+Date:   Wed May 19 16:41:01 2010 -0400
+
+    qemu: Allow using regular audio backends with VNC
+    
+    Currently all host audio backends are disabled if a VM is using VNC, in
+    favor of the QEMU VNC audio extension. Unfortunately no released VNC
+    client supports this extension, so users have no way of getting audio
+    to work if using VNC.
+    
+    Add a new config option in qemu.conf which allows changing libvirt's
+    behavior, but keep the default intact.
+    
+    v2: Fix doc typos, change name to vnc_allow_host_audio
+
+diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug
+index 5bd60b3..551cc20 100644
+--- a/src/qemu/libvirtd_qemu.aug
+++ b/src/qemu/libvirtd_qemu.aug
+@@ -38,6 +38,7 @@ module Libvirtd_qemu =
+                  | str_entry "save_image_format"
+                  | str_entry "hugetlbfs_mount"
+                  | bool_entry "relaxed_acs_check"
+                 | bool_entry "vnc_allow_host_audio"
+ 
+    (* Each enty in the config is one of the following three ... *)
+    let entry = vnc_entry
+diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf
+index 3da332f..98a1176 100644
+--- a/src/qemu/qemu.conf
+++ b/src/qemu/qemu.conf
+@@ -168,3 +168,13 @@
+ # be assigned to guests.
+ #
+ # relaxed_acs_check = 1
+
+
+# QEMU implements an extension for providing audio over a VNC connection,
+# though if your VNC client does not support it, your only chance for getting
+# sound output is through regular audio backends. By default, libvirt will
+# disable all QEMU sound backends if using VNC, since they can cause
+# permissions issues. Enabling this option will make libvirtd honor the
+# QEMU_AUDIO_DRV environment variable when using VNC.
+#
+# vnc_allow_host_audio = 0
+diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
+index 2755545..b4d8e74 100644
+--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
+@@ -351,6 +351,10 @@ int qemudLoadDriverConfig(struct qemud_driver *driver,
+     CHECK_TYPE ("relaxed_acs_check", VIR_CONF_LONG);
+     if (p) driver->relaxedACS = p->l;
+ 
+    p = virConfGetValue (conf, "vnc_allow_host_audio");
+    CHECK_TYPE ("vnc_allow_host_audio", VIR_CONF_LONG);
+    if (p) driver->vncAllowHostAudio = p->l;
+
+     virConfFree (conf);
+     return 0;
+ }
+@@ -4399,12 +4403,15 @@ int qemudBuildCommandLine(virConnectPtr conn,
+             ADD_ARG_LIT(def->graphics[0]->data.vnc.keymap);
+         }
+ 
+-        /* QEMU implements a VNC extension for providing audio, so we
+-         * set the audio backend to none, to prevent it opening the
+-         * host OS audio devices since that causes security issues
+-         * and is non-sensical when using VNC.
+        /* Unless user requested it, set the audio backend to none, to
+         * prevent it opening the host OS audio devices, since that causes
+         * security issues and might not work when using VNC.
+          */
+-        ADD_ENV_LIT("QEMU_AUDIO_DRV=none");
+        if (driver->vncAllowHostAudio) {
+            ADD_ENV_COPY("QEMU_AUDIO_DRV");
+        } else {
+            ADD_ENV_LIT("QEMU_AUDIO_DRV=none");
+        }
+     } else if ((def->ngraphics == 1) &&
+                def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_SDL) {
+         char *xauth = NULL;
+diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
+index 8fd8d79..7fb4de5 100644
+--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
+@@ -138,6 +138,8 @@ struct qemud_driver {
+ 
+     unsigned int relaxedACS : 1;
+ 
+    unsigned int vncAllowHostAudio : 1;
+
+     virCapsPtr caps;
+ 
+     /* An array of callbacks */
+diff --git a/src/qemu/test_libvirtd_qemu.aug b/src/qemu/test_libvirtd_qemu.aug
+index 2feedc0..a048ae5 100644
+--- a/src/qemu/test_libvirtd_qemu.aug
+++ b/src/qemu/test_libvirtd_qemu.aug
+@@ -97,6 +97,8 @@ save_image_format = \"gzip\"
+ hugetlbfs_mount = \"/dev/hugepages\"
+ 
+ relaxed_acs_check = 1
+
+vnc_allow_host_audio = 1
+ "
+ 
+    test Libvirtd_qemu.lns get conf =
+@@ -204,3 +206,5 @@ relaxed_acs_check = 1
+ { "hugetlbfs_mount" = "/dev/hugepages" }
+ { "#empty" }
+ { "relaxed_acs_check" = "1" }
+{ "#empty" }
+{ "vnc_allow_host_audio" = "1" }
@@ -0,0 +1,110 @@
+diff -rup libvirt-0.7.7/src/qemu/libvirtd_qemu.aug new/src/qemu/libvirtd_qemu.aug
+--- libvirt-0.7.7/src/qemu/libvirtd_qemu.aug	2010-06-17 12:38:52.998946000 -0400
+++ new/src/qemu/libvirtd_qemu.aug	2010-06-17 12:39:28.504148000 -0400
+@@ -39,6 +39,7 @@ module Libvirtd_qemu =
+                  | str_entry "hugetlbfs_mount"
+                  | bool_entry "relaxed_acs_check"
+                  | bool_entry "vnc_allow_host_audio"
+                 | bool_entry "clear_emulator_capabilities"
+ 
+    (* Each enty in the config is one of the following three ... *)
+    let entry = vnc_entry
+diff -rup libvirt-0.7.7/src/qemu/qemu.conf new/src/qemu/qemu.conf
+--- libvirt-0.7.7/src/qemu/qemu.conf	2010-06-17 12:38:53.001953000 -0400
+++ new/src/qemu/qemu.conf	2010-06-17 12:39:28.508149000 -0400
+@@ -178,3 +178,12 @@
+ # QEMU_AUDIO_DRV environment variable when using VNC.
+ #
+ # vnc_allow_host_audio = 0
+
+# If clear_emulator_capabilities is enabled, libvirt will drop all
+# privileged capabilities of the QEmu/KVM emulator. This is enabled by
+# default.
+#
+# Warning: Disabling this option means that a compromised guest can
+# exploit the privileges and possibly do damage to the host.
+#
+# clear_emulator_capabilities = 1
+diff -rup libvirt-0.7.7/src/qemu/qemu_conf.c new/src/qemu/qemu_conf.c
+--- libvirt-0.7.7/src/qemu/qemu_conf.c	2010-06-17 12:38:53.010946000 -0400
+++ new/src/qemu/qemu_conf.c	2010-06-17 12:39:28.526151000 -0400
+@@ -103,6 +103,7 @@ int qemudLoadDriverConfig(struct qemud_d
+ 
+     /* Setup critical defaults */
+     driver->dynamicOwnership = 1;
+    driver->clearEmulatorCapabilities = 1;
+ 
+     if (!(driver->vncListen = strdup("127.0.0.1"))) {
+         virReportOOMError();
+@@ -354,6 +355,10 @@ int qemudLoadDriverConfig(struct qemud_d
+     CHECK_TYPE ("vnc_allow_host_audio", VIR_CONF_LONG);
+     if (p) driver->vncAllowHostAudio = p->l;
+ 
+    p = virConfGetValue (conf, "clear_emulator_capabilities");
+    CHECK_TYPE ("clear_emulator_capabilities", VIR_CONF_LONG);
+    if (p) driver->clearEmulatorCapabilities = p->l;
+
+     virConfFree (conf);
+     return 0;
+ }
+diff -rup libvirt-0.7.7/src/qemu/qemu_conf.h new/src/qemu/qemu_conf.h
+--- libvirt-0.7.7/src/qemu/qemu_conf.h	2010-06-17 12:38:53.015945000 -0400
+++ new/src/qemu/qemu_conf.h	2010-06-17 12:39:28.531146000 -0400
+@@ -129,8 +129,8 @@ struct qemud_driver {
+     ebtablesContext *ebtables;
+ 
+     unsigned int relaxedACS : 1;
+-
+     unsigned int vncAllowHostAudio : 1;
+    unsigned int clearEmulatorCapabilities : 1;
+ 
+     virCapsPtr caps;
+ 
+diff -rup libvirt-0.7.7/src/qemu/qemu_driver.c new/src/qemu/qemu_driver.c
+--- libvirt-0.7.7/src/qemu/qemu_driver.c	2010-06-17 12:38:52.988953000 -0400
+++ new/src/qemu/qemu_driver.c	2010-06-17 12:39:28.542147000 -0400
+@@ -2699,7 +2699,7 @@ static int qemudStartVMDaemon(virConnect
+                               int stdin_fd) {
+     const char **argv = NULL, **tmp;
+     const char **progenv = NULL;
+-    int i, ret;
+    int i, ret, runflags;
+     struct stat sb;
+     int *tapfds = NULL;
+     int ntapfds = 0;
+@@ -2893,9 +2893,16 @@ static int qemudStartVMDaemon(virConnect
+     for (i = 0 ; i < ntapfds ; i++)
+         FD_SET(tapfds[i], &keepfd);
+ 
+    VIR_DEBUG("Clear emulator capabilities: %d",
+              driver->clearEmulatorCapabilities);
+    runflags = VIR_EXEC_NONBLOCK;
+    if (driver->clearEmulatorCapabilities) {
+        runflags |= VIR_EXEC_CLEAR_CAPS;
+    }
+
+     ret = virExecDaemonize(argv, progenv, &keepfd, &child,
+                            stdin_fd, &logfile, &logfile,
+-                           VIR_EXEC_NONBLOCK | VIR_EXEC_CLEAR_CAPS,
+                           runflags,
+                            qemudSecurityHook, &hookData,
+                            pidfile);
+     VIR_FREE(pidfile);
+diff -rup libvirt-0.7.7/src/qemu/test_libvirtd_qemu.aug new/src/qemu/test_libvirtd_qemu.aug
+--- libvirt-0.7.7/src/qemu/test_libvirtd_qemu.aug	2010-06-17 12:38:53.018948000 -0400
+++ new/src/qemu/test_libvirtd_qemu.aug	2010-06-17 12:39:28.546145000 -0400
+@@ -99,6 +99,8 @@ hugetlbfs_mount = \"/dev/hugepages\"
+ relaxed_acs_check = 1
+ 
+ vnc_allow_host_audio = 1
+
+clear_emulator_capabilities = 0
+ "
+ 
+    test Libvirtd_qemu.lns get conf =
+@@ -208,3 +210,5 @@ vnc_allow_host_audio = 1
+ { "relaxed_acs_check" = "1" }
+ { "#empty" }
+ { "vnc_allow_host_audio" = "1" }
+{ "#empty" }
+{ "clear_emulator_capabilities" = "0" }
@@ -0,0 +1,132 @@
+commit c4896d378b921ba6471562d7b17641be121c19d6
+Author: Daniel P. Berrange <berrange@redhat.com>
+Date:   Thu Apr 15 11:35:07 2010 +0100
+
+    Fix CDROM media change for QEMU when using -device syntax
+    
+    Disk devices in QEMU have two parts, the guest device and the host
+    backend driver. Historically these two parts have had the same
+    "unique" name. With the switch to using -device though, they now
+    have separate names. Thus when changing CDROM media, for guests
+    using -device syntax, we need to prepend the QEMU_DRIVE_HOST_PREFIX
+    constant
+    
+    * src/qemu/qemu_conf.c, src/qemu/qemu_conf.h: Add helper function
+      qemuDeviceDriveHostAlias() for building a host backend alias
+    * src/qemu/qemu_driver.c: Use qemuDeviceDriveHostAlias() to determine
+      the host backend alias for performing eject/change commands in the
+      monitor
+
+diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
+index 1a8b4aa..0cbedf2 100644
+--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
+@@ -1699,6 +1699,26 @@ static int qemuAssignDeviceDiskAliasLegacy(virDomainDiskDefPtr disk)
+ }
+ 
+ 
+char *qemuDeviceDriveHostAlias(virDomainDiskDefPtr disk,
+                               unsigned long long qemudCmdFlags)
+{
+    char *ret;
+
+    if (qemudCmdFlags & QEMUD_CMD_FLAG_DEVICE) {
+        if (virAsprintf(&ret, "%s%s", QEMU_DRIVE_HOST_PREFIX, disk->info.alias) < 0) {
+            virReportOOMError();
+            return NULL;
+        }
+    } else {
+        if (!(ret = strdup(disk->info.alias))) {
+            virReportOOMError();
+            return NULL;
+        }
+    }
+    return ret;
+}
+
+
+ /* Names used before -drive supported the id= option */
+ static int qemuAssignDeviceDiskAliasFixed(virDomainDiskDefPtr disk)
+ {
+diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
+index 574709e..b2820f0 100644
+--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
+@@ -220,6 +220,9 @@ char * qemuBuildNicStr(virDomainNetDefPtr net,
+ char * qemuBuildNicDevStr(virDomainNetDefPtr net,
+                           int vlan);
+ 
+char *qemuDeviceDriveHostAlias(virDomainDiskDefPtr disk,
+                               unsigned long long qemudCmdFlags);
+
+ /* Both legacy & current support */
+ char *qemuBuildDriveStr(virDomainDiskDefPtr disk,
+                         int bootable,
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index 0189dcf..7d2f3ef 100644
+--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
+@@ -6552,11 +6552,13 @@ cleanup:
+ 
+ static int qemudDomainChangeEjectableMedia(struct qemud_driver *driver,
+                                            virDomainObjPtr vm,
+-                                           virDomainDiskDefPtr disk)
+                                           virDomainDiskDefPtr disk,
+                                           unsigned long long qemuCmdFlags)
+ {
+     virDomainDiskDefPtr origdisk = NULL;
+     int i;
+     int ret;
+    char *driveAlias = NULL;
+ 
+     origdisk = NULL;
+     for (i = 0 ; i < vm->def->ndisks ; i++) {
+@@ -6594,6 +6596,9 @@ static int qemudDomainChangeEjectableMedia(struct qemud_driver *driver,
+         driver->securityDriver->domainSetSecurityImageLabel(vm, disk) < 0)
+         return -1;
+ 
+    if (!(driveAlias = qemuDeviceDriveHostAlias(origdisk, qemuCmdFlags)))
+        goto error;
+
+     qemuDomainObjPrivatePtr priv = vm->privateData;
+     qemuDomainObjEnterMonitorWithDriver(driver, vm);
+     if (disk->src) {
+@@ -6605,10 +6610,10 @@ static int qemudDomainChangeEjectableMedia(struct qemud_driver *driver,
+                 format = origdisk->driverType;
+         }
+         ret = qemuMonitorChangeMedia(priv->mon,
+-                                     origdisk->info.alias,
+                                     driveAlias,
+                                      disk->src, format);
+     } else {
+-        ret = qemuMonitorEjectMedia(priv->mon, origdisk->info.alias);
+        ret = qemuMonitorEjectMedia(priv->mon, driveAlias);
+     }
+     qemuDomainObjExitMonitorWithDriver(driver, vm);
+ 
+@@ -6625,11 +6630,14 @@ static int qemudDomainChangeEjectableMedia(struct qemud_driver *driver,
+     disk->src = NULL;
+     origdisk->type = disk->type;
+ 
+    VIR_FREE(driveAlias);
+
+     virDomainDiskDefFree(disk);
+ 
+     return ret;
+ 
+ error:
+    VIR_FREE(driveAlias);
+     if (driver->securityDriver &&
+         driver->securityDriver->domainRestoreSecurityImageLabel &&
+         driver->securityDriver->domainRestoreSecurityImageLabel(vm, disk) < 0)
+@@ -7434,7 +7442,9 @@ static int qemudDomainAttachDevice(virDomainPtr dom,
+         switch (dev->data.disk->device) {
+         case VIR_DOMAIN_DISK_DEVICE_CDROM:
+         case VIR_DOMAIN_DISK_DEVICE_FLOPPY:
+-            ret = qemudDomainChangeEjectableMedia(driver, vm, dev->data.disk);
+            ret = qemudDomainChangeEjectableMedia(driver, vm,
+                                                  dev->data.disk,
+                                                  qemuCmdFlags);
+             if (ret == 0)
+                 dev->data.disk = NULL;
+             break;
@@ -0,0 +1,41 @@
+From e3c36a2575bc88a16d776693dc39ea01c780b406 Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 16 Mar 2010 16:03:59 +0100
+Subject: [PATCH] Use fsync() at the end of file allocation instead of O_DSYNC
+
+Instead of opening storage file with O_DSYNC, make sure data are written
+to a disk only before we claim allocation has finished.
+---
+ src/storage/storage_backend.c |    9 ++++++++-
+ 1 files changed, 8 insertions(+), 1 deletions(-)
+
+diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c
+index ec9fc43..7294a00 100644
+--- a/src/storage/storage_backend.c
+++ b/src/storage/storage_backend.c
+@@ -331,6 +331,13 @@ static int createRawFileOpHook(int fd, void *data) {
+                 goto cleanup;
+             }
+         }
+
+        if (fsync(fd) < 0) {
+            ret = errno;
+            virReportSystemError(errno, _("cannot sync data to file '%s'"),
+                                 hdata->vol->target.path);
+            goto cleanup;
+        }
+     }
+ 
+ cleanup:
+@@ -359,7 +366,7 @@ virStorageBackendCreateRaw(virConnectPtr conn ATTRIBUTE_UNUSED,
+     gid_t gid = (vol->target.perms.gid == -1) ? getgid() : vol->target.perms.gid;
+ 
+     if ((createstat = virFileOperation(vol->target.path,
+-                                       O_RDWR | O_CREAT | O_EXCL | O_DSYNC,
+                                       O_RDWR | O_CREAT | O_EXCL,
+                                        vol->target.perms.mode, uid, gid,
+                                        createRawFileOpHook, &hdata,
+                                        VIR_FILE_OP_FORCE_PERMS |
+-- 
+1.6.6.1
+
@@ -0,0 +1,12 @@
+diff -rup libvirt-0.7.1/src/util/hostusb.c new/src/hostusb.c
+--- libvirt-0.7.1/src/util/hostusb.c	2010-06-03 13:51:14.392459000 -0400
+++ new/src/util/hostusb.c	2010-06-03 14:49:11.763379000 -0400
+@@ -123,7 +123,7 @@ static int usbFindBusByVendor(virConnect
+             char *tmpstr = de->d_name;
+             unsigned found_bus, found_addr;
+ 
+-            if (STREQ(de->d_name, "usb"))
+            if (STRPREFIX(de->d_name, "usb"))
+                 tmpstr += 3;
+ 
+             if (virStrToLong_ui(tmpstr, &ignore, 10, &found_bus) < 0) {
@@ -0,0 +1,233 @@
+From 3a441522017aa9c1b8b54d2ce4569d0f0d96fa72 Mon Sep 17 00:00:00 2001
+From: Cole Robinson <crobinso@redhat.com>
+Date: Fri, 12 Mar 2010 12:36:56 -0500
+Subject: [PATCH] qemu: Add some debugging at domain startup
+
+---
+ src/qemu/qemu_driver.c |   24 +++++++++++++++++++++++-
+ 1 files changed, 23 insertions(+), 1 deletions(-)
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index f8ab545..040d645 100644
+--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
+@@ -2695,6 +2695,8 @@ static int qemudStartVMDaemon(virConnectPtr conn,
+ 
+     FD_ZERO(&keepfd);
+ 
+    DEBUG0("Beginning VM startup process");
+
+     if (virDomainObjIsActive(vm)) {
+         qemuReportError(VIR_ERR_OPERATION_INVALID,
+                         "%s", _("VM is already active"));
+@@ -2703,22 +2705,27 @@ static int qemudStartVMDaemon(virConnectPtr conn,
+ 
+     /* If you are using a SecurityDriver with dynamic labelling,
+        then generate a security label for isolation */
+    DEBUG0("Generating domain security label (if required)");
+     if (driver->securityDriver &&
+         driver->securityDriver->domainGenSecurityLabel &&
+         driver->securityDriver->domainGenSecurityLabel(vm) < 0)
+         return -1;
+ 
+    DEBUG0("Generating setting domain security labels (if required)");
+     if (driver->securityDriver &&
+         driver->securityDriver->domainSetSecurityAllLabel &&
+         driver->securityDriver->domainSetSecurityAllLabel(vm) < 0)
+         goto cleanup;
+ 
+-    /* Ensure no historical cgroup for this VM is lieing around bogus settings */
+    /* Ensure no historical cgroup for this VM is lying around bogus
+     * settings */
+    DEBUG0("Ensuring no historical cgroup is lying around");
+     qemuRemoveCgroup(driver, vm, 1);
+ 
+     if ((vm->def->ngraphics == 1) &&
+         vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC &&
+         vm->def->graphics[0]->data.vnc.autoport) {
+        DEBUG0("Determining VNC port");
+         int port = qemudNextFreeVNCPort(driver);
+         if (port < 0) {
+             qemuReportError(VIR_ERR_INTERNAL_ERROR,
+@@ -2735,6 +2742,7 @@ static int qemudStartVMDaemon(virConnectPtr conn,
+         goto cleanup;
+     }
+ 
+    DEBUG0("Creating domain log file");
+     if ((logfile = qemudLogFD(driver, vm->def->name)) < 0)
+         goto cleanup;
+ 
+@@ -2751,14 +2759,17 @@ static int qemudStartVMDaemon(virConnectPtr conn,
+         goto cleanup;
+     }
+ 
+    DEBUG0("Determing emulator version");
+     if (qemudExtractVersionInfo(emulator,
+                                 NULL,
+                                 &qemuCmdFlags) < 0)
+         goto cleanup;
+ 
+    DEBUG0("Setting up domain cgroup (if required)");
+     if (qemuSetupCgroup(driver, vm) < 0)
+         goto cleanup;
+ 
+    DEBUG0("Preparing host devices");
+     if (qemuPrepareHostDevices(driver, vm->def) < 0)
+         goto cleanup;
+ 
+@@ -2767,6 +2778,7 @@ static int qemudStartVMDaemon(virConnectPtr conn,
+         goto cleanup;
+     }
+ 
+    DEBUG0("Preparing monitor state");
+     if (qemuPrepareMonitorChr(driver, priv->monConfig, vm->def->name) < 0)
+         goto cleanup;
+ 
+@@ -2798,6 +2810,7 @@ static int qemudStartVMDaemon(virConnectPtr conn,
+      * use in hotplug
+      */
+     if (qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE) {
+        DEBUG0("Assigning domain PCI addresses");
+         /* Populate cache with current addresses */
+         if (priv->pciaddrs) {
+             qemuDomainPCIAddressSetFree(priv->pciaddrs);
+@@ -2816,6 +2829,7 @@ static int qemudStartVMDaemon(virConnectPtr conn,
+         priv->persistentAddrs = 0;
+     }
+ 
+    DEBUG0("Building emulator command line");
+     vm->def->id = driver->nextvmid++;
+     if (qemudBuildCommandLine(conn, driver, vm->def, priv->monConfig,
+                               priv->monJSON, qemuCmdFlags, &argv, &progenv,
+@@ -2899,25 +2913,31 @@ static int qemudStartVMDaemon(virConnectPtr conn,
+     if (ret == -1) /* The VM failed to start */
+         goto cleanup;
+ 
+    DEBUG0("Waiting for monitor to show up");
+     if (qemudWaitForMonitor(driver, vm, pos) < 0)
+         goto abort;
+ 
+    DEBUG0("Detecting VCPU PIDs");
+     if (qemuDetectVcpuPIDs(driver, vm) < 0)
+         goto abort;
+ 
+    DEBUG0("Setting CPU affinity");
+     if (qemudInitCpuAffinity(vm) < 0)
+         goto abort;
+ 
+    DEBUG0("Setting any required VM passwords");
+     if (qemuInitPasswords(conn, driver, vm, qemuCmdFlags) < 0)
+         goto abort;
+ 
+     /* If we have -device, then addresses are assigned explicitly.
+      * If not, then we have to detect dynamic ones here */
+     if (!(qemuCmdFlags & QEMUD_CMD_FLAG_DEVICE)) {
+        DEBUG0("Determining domain device PCI addresses");
+         if (qemuInitPCIAddresses(driver, vm) < 0)
+             goto abort;
+     }
+ 
+    DEBUG0("Setting initial memory amount");
+     qemuDomainObjEnterMonitorWithDriver(driver, vm);
+     if (qemuMonitorSetBalloon(priv->mon, vm->def->memory) < 0) {
+         qemuDomainObjExitMonitorWithDriver(driver, vm);
+@@ -2925,6 +2945,7 @@ static int qemudStartVMDaemon(virConnectPtr conn,
+     }
+ 
+     if (migrateFrom == NULL) {
+        DEBUG0("Starting domain CPUs");
+         /* Allow the CPUS to start executing */
+         if (qemuMonitorStartCPUs(priv->mon, conn) < 0) {
+             if (virGetLastError() == NULL)
+@@ -2937,6 +2958,7 @@ static int qemudStartVMDaemon(virConnectPtr conn,
+     qemuDomainObjExitMonitorWithDriver(driver, vm);
+ 
+ 
+    DEBUG0("Writing domain status to disk");
+     if (virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0)
+         goto abort;
+ 
+-- 
+1.6.6.1
+
+From 6d5c8a8f51db8ce97ab35ab6022dd5c94ab016b4 Mon Sep 17 00:00:00 2001
+From: Cole Robinson <crobinso@redhat.com>
+Date: Fri, 12 Mar 2010 12:37:52 -0500
+Subject: [PATCH] qemu: Fix USB by product with security enabled
+
+We need to call PrepareHostdevs to determine the USB device path before
+any security calls. PrepareHostUSBDevices was also incorrectly skipping
+all USB devices.
+---
+ src/qemu/qemu_driver.c |   11 ++++++-----
+ 1 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index 040d645..b17d26d 100644
+--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
+@@ -2360,7 +2360,7 @@ qemuPrepareHostUSBDevices(struct qemud_driver *driver ATTRIBUTE_UNUSED,
+ 
+         if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
+             continue;
+-        if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
+        if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB)
+             continue;
+ 
+         /* Resolve a vendor/product to bus/device */
+@@ -2703,6 +2703,11 @@ static int qemudStartVMDaemon(virConnectPtr conn,
+         return -1;
+     }
+ 
+    /* Must be run before security labelling */
+    DEBUG0("Preparing host devices");
+    if (qemuPrepareHostDevices(driver, vm->def) < 0)
+        goto cleanup;
+
+     /* If you are using a SecurityDriver with dynamic labelling,
+        then generate a security label for isolation */
+     DEBUG0("Generating domain security label (if required)");
+@@ -2769,10 +2774,6 @@ static int qemudStartVMDaemon(virConnectPtr conn,
+     if (qemuSetupCgroup(driver, vm) < 0)
+         goto cleanup;
+ 
+-    DEBUG0("Preparing host devices");
+-    if (qemuPrepareHostDevices(driver, vm->def) < 0)
+-        goto cleanup;
+-
+     if (VIR_ALLOC(priv->monConfig) < 0) {
+         virReportOOMError();
+         goto cleanup;
+-- 
+1.6.6.1
+
+From 65e97240e6e4606820dd1c42ac172319e0af4d8d Mon Sep 17 00:00:00 2001
+From: Cole Robinson <crobinso@redhat.com>
+Date: Mon, 22 Mar 2010 10:45:36 -0400
+Subject: [PATCH] security: selinux: Fix crash when releasing non-existent label
+
+This can be triggered by the qemuStartVMDaemon cleanup path if a
+VM references a non-existent USB device (by product) in the XML.
+
+Signed-off-by: Cole Robinson <crobinso@redhat.com>
+---
+ src/security/security_selinux.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
+index 975b315..6680e2d 100644
+--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
+@@ -632,7 +632,8 @@ SELinuxReleaseSecurityLabel(virDomainObjPtr vm)
+ {
+     const virSecurityLabelDefPtr secdef = &vm->def->seclabel;
+ 
+-    if (secdef->type == VIR_DOMAIN_SECLABEL_STATIC)
+    if (secdef->type == VIR_DOMAIN_SECLABEL_STATIC ||
+        secdef->label == NULL)
+         return 0;
+ 
+     context_t con = context_new(secdef->label);
+-- 
+1.6.6.1
+
@@ -0,0 +1,35 @@
+commit 9d0adf249827dde9e1c0d1c19513cf6018ceb34e
+Author: Cole Robinson <crobinso@redhat.com>
+Date:   Wed May 19 15:57:56 2010 -0400
+
+    daemon: A few initscript corrections
+    
+    Fedora bug https://bugzilla.redhat.com/show_bug.cgi?id=565238
+    
+    - Avahi service is called 'avahi-daemon'
+    - chkconfig descriptions must use \ for line continuations
+
+diff --git a/daemon/libvirtd.init.in b/daemon/libvirtd.init.in
+index d4dc98b..809433e 100644
+--- a/daemon/libvirtd.init.in
+++ b/daemon/libvirtd.init.in
+@@ -9,7 +9,7 @@
+ # Should-Start: $named
+ # Should-Start: xend
+ # Should-Start: hal
+-# Should-Start: avahi
+# Should-Start: avahi-daemon
+ # Required-Stop: $network messagebus
+ # Should-Stop: $named
+ # Default-Start: 3 4 5
+@@ -24,8 +24,8 @@
+ # libvirtd:   guest and virtual network management daemon
+ #
+ # chkconfig: 345 97 03
+-# description:  This is a daemon for managing guest instances
+-#               and libvirt virtual networks
+# description:  This is a daemon for managing guest instances \
+#               and libvirt virtual networks \
+ #               See http://libvirt.org
+ #
+ # processname: libvirtd
@@ -0,0 +1,65 @@
+commit e5f31f461f63bbad211e84b810d6ba43a705f9dd
+Author: Justin Clift <justin@salasaga.org>
+Date:   Sun May 30 13:28:42 2010 +1000
+
+    Trivial virsh.pod additions --all for "list" command and similar
+    
+    This is just a trivial patch to virsh.pod (from git master). It adds the
+    following pieces to the virsh man page:
+    
+      + Shows the --inactive and --all optional parameters for the list
+        command.
+    
+        Closes Bugzilla #575512, reported by Renich Bon Ciric
+        https://bugzilla.redhat.com/show_bug.cgi?id=575512
+    
+      + Corrects the existing description of the list command, to now say
+        that only running domains are listed if no domains are specified.
+    
+        The man page up until this point has said all domains are listed if
+        no domains are specified, which is incorrect.
+    
+      + Adds the "shut off" state to the list of states for the list
+        command.
+    
+      + Adds a missing =back around line 755, that pod2man was complaining
+        was missing.
+
+diff --git a/tools/virsh.pod b/tools/virsh.pod
+index cf7585d..495bb46 100644
+--- a/tools/virsh.pod
+++ b/tools/virsh.pod
+@@ -156,10 +156,10 @@ description see:
+   L<http://libvirt.org/formatcaps.html>
+ The XML also show the NUMA topology information if available.
+ 
+-=item B<list>
+=item B<list> optional I<--inactive> I<--all>
+ 
+ Prints information about one or more domains.  If no domains are
+-specified it prints out information about all domains.
+specified it prints out information about running domains.
+ 
+ An example format for the list is as follows:
+ 
+@@ -177,7 +177,7 @@ State is the run state (see below).
+ 
+ B<STATES>
+ 
+-The State field lists 6 states for a domain, and which ones the
+The State field lists 7 states for a domain, and which ones the
+ current domain is in.
+ 
+ =over 4
+@@ -205,6 +205,11 @@ The domain is in the process of shutting down, i.e. the guest operating system
+ has been notified and should be in the process of stopping its operations
+ gracefully.
+ 
+=item B<shut off>
+
+The domain is not running.  Usually this indicates the domain has been
+shut down completely, or has not been started.
+
+ =item B<crashed>
+ 
+ The domain has crashed, which is always a violent ending.  Usually
@@ -0,0 +1,169 @@
+commit a83fe2c23efad190a1e00e448f607fe032650fd6
+Author: Cole Robinson <crobinso@redhat.com>
+Date:   Thu May 20 19:31:16 2010 -0400
+
+    network: bridge: Don't start network if it collides with host routing
+    
+    Fedora bug https://bugzilla.redhat.com/show_bug.cgi?id=235961
+    
+    If using the default virtual network, an easy way to lose guest network
+    connectivity is to install libvirt inside the VM. The autostarted
+    default network inside the guest collides with host virtual network
+    routing. This is a long standing issue that has caused users quite a
+    bit of pain and confusion.
+    
+    On network startup, parse /proc/net/route and compare the requested
+    IP+netmask against host routing destinations: if any matches are found,
+    refuse to start the network.
+    
+    v2: Drop sscanf, fix a comment typo, comment that function could use
+        libnl instead of /proc
+    
+    v3: Consider route netmask. Compare binary data rather than convert to
+        string.
+    
+    v4: Return to using sscanf, drop inet functions in favor of virSocket,
+        parsing safety checks. Don't make parse failures fatal, in case
+        expected format changes.
+    
+    v5: Try and continue if we receive unexpected. Delimit parsed lines to
+        prevent scanning past newline
+
+diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
+index 5d7ef19..7ab3f3e 100644
+--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
+@@ -57,6 +57,7 @@
+ #include "iptables.h"
+ #include "bridge.h"
+ #include "logging.h"
+#include "util/network.h"
+ 
+ #define NETWORK_PID_DIR LOCAL_STATE_DIR "/run/libvirt/network"
+ #define NETWORK_STATE_DIR LOCAL_STATE_DIR "/lib/libvirt/network"
+@@ -908,6 +909,114 @@ cleanup:
+     return ret;
+ }
+ 
+#define PROC_NET_ROUTE "/proc/net/route"
+
+/* XXX: This function can be a lot more exhaustive, there are certainly
+ *      other scenarios where we can ruin host network connectivity.
+ * XXX: Using a proper library is preferred over parsing /proc
+ */
+static int networkCheckRouteCollision(virNetworkObjPtr network)
+{
+    int ret = -1, len;
+    unsigned int net_dest;
+    char *cur, *buf = NULL;
+    enum {MAX_ROUTE_SIZE = 1024*64};
+    virSocketAddr inaddress, innetmask;
+
+    if (!network->def->ipAddress || !network->def->netmask)
+        return 0;
+
+    if (virSocketParseAddr(network->def->ipAddress, &inaddress, 0) < 0) {
+        networkReportError(VIR_ERR_INTERNAL_ERROR,
+                           _("cannot parse IP address '%s'"),
+                           network->def->ipAddress);
+        goto error;
+    }
+
+    if (virSocketParseAddr(network->def->netmask, &innetmask, 0) < 0) {
+        networkReportError(VIR_ERR_INTERNAL_ERROR,
+                           _("cannot parse netmask '%s'"),
+                           network->def->netmask);
+        goto error;
+    }
+
+    if (inaddress.stor.ss_family != AF_INET ||
+        innetmask.stor.ss_family != AF_INET) {
+        /* Only support collision check for IPv4 */
+        goto out;
+    }
+
+    net_dest = (inaddress.inet4.sin_addr.s_addr &
+                innetmask.inet4.sin_addr.s_addr);
+
+    /* Read whole routing table into memory */
+    if ((len = virFileReadAll(PROC_NET_ROUTE, MAX_ROUTE_SIZE, &buf)) < 0)
+        goto error;
+
+    /* Dropping the last character shouldn't hurt */
+    if (len > 0)
+        buf[len-1] = '\0';
+
+    VIR_DEBUG("%s output:\n%s", PROC_NET_ROUTE, buf);
+
+    if (!STRPREFIX (buf, "Iface"))
+        goto out;
+
+    /* First line is just headings, skip it */
+    cur = strchr(buf, '\n');
+    if (cur)
+        cur++;
+
+    while (cur) {
+        char iface[17], dest[128], mask[128];
+        unsigned int addr_val, mask_val;
+        int num;
+
+        /* NUL-terminate the line, so sscanf doesn't go beyond a newline.  */
+        char *nl = strchr(cur, '\n');
+        if (nl) {
+            *nl++ = '\0';
+        }
+
+        num = sscanf(cur, "%16s %127s %*s %*s %*s %*s %*s %127s",
+                     iface, dest, mask);
+        cur = nl;
+
+        if (num != 3) {
+            VIR_DEBUG("Failed to parse %s", PROC_NET_ROUTE);
+            continue;
+        }
+
+        if (virStrToLong_ui(dest, NULL, 16, &addr_val) < 0) {
+            VIR_DEBUG("Failed to convert network address %s to uint", dest);
+            continue;
+        }
+
+        if (virStrToLong_ui(mask, NULL, 16, &mask_val) < 0) {
+            VIR_DEBUG("Failed to convert network mask %s to uint", mask);
+            continue;
+        }
+
+        addr_val &= mask_val;
+
+        if ((net_dest == addr_val) &&
+            (innetmask.inet4.sin_addr.s_addr == mask_val)) {
+            networkReportError(VIR_ERR_INTERNAL_ERROR,
+                              _("Network %s/%s is already in use by "
+                                "interface %s"),
+                                network->def->ipAddress,
+                                network->def->netmask, iface);
+            goto error;
+        }
+    }
+
+out:
+    ret = 0;
+error:
+    VIR_FREE(buf);
+    return ret;
+}
+
+ static int networkStartNetworkDaemon(struct network_driver *driver,
+                                      virNetworkObjPtr network)
+ {
+@@ -919,6 +1028,10 @@ static int networkStartNetworkDaemon(struct network_driver *driver,
+         return -1;
+     }
+ 
+    /* Check to see if network collides with an existing route */
+    if (networkCheckRouteCollision(network) < 0)
+        return -1;
+
+     if ((err = brAddBridge(driver->brctl, network->def->bridge))) {
+         virReportSystemError(err,
+                              _("cannot create bridge '%s'"),
@@ -0,0 +1,26 @@
+commit b7a7b3365145f6e9e434a3265a58666cd2e6d8dd
+Author: Guido Günther <agx@sigxcpu.org>
+Date:   Wed Mar 17 21:04:11 2010 +0100
+
+    Don't crash without a security driver
+    
+    "virsh dominfo <vm>" crashes if there's no primary security driver set
+    since we only intialize the secmodel.model and secmodel.doi if we have
+    one. Attached patch checks for securityPrimaryDriver instead of
+    securityDriver since the later is always set in qemudSecurityInit().
+    
+    Closes: http://bugs.debian.org/574359
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index 1f2b11d..257f914 100644
+--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
+@@ -4979,7 +4979,7 @@ static int qemudNodeGetSecurityModel(virConnectPtr conn,
+     int ret = 0;
+ 
+     qemuDriverLock(driver);
+-    if (!driver->securityDriver) {
+    if (!driver->securityPrimaryDriver) {
+         memset(secmodel, 0, sizeof (*secmodel));
+         goto cleanup;
+     }
@@ -0,0 +1,77 @@
+commit 74c7a3463d18a530d6d749d0199061b5d3f17faa
+Author: Cole Robinson <crobinso@redhat.com>
+Date:   Tue May 11 14:44:34 2010 -0400
+
+    node_device: udev: Fix PCI product/vendor swappage
+    
+    Product and vendor values were swapped in the XML, which made virt-manager
+    PCI device listing kinda useless.
+
+diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
+index bcfe991..4a9d65f 100644
+--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
+@@ -382,8 +382,8 @@ static int udevTranslatePCIIds(unsigned int vendor,
+ 
+     /* pci_get_strings returns void */
+     pci_get_strings(&m,
+-                    &vendor_name,
+                     &device_name,
+                    &vendor_name,
+                     NULL,
+                     NULL);
+ 
+commit 75d88455f54088f88bc7a503da0a4cd413ef7b95
+Author: Klaus Ethgen <Klaus@Ethgen.de>
+Date:   Tue Apr 27 09:20:47 2010 +0200
+
+    The base used for conversion of USB values should be 16 not 10.
+    
+    Signed-off-by: Guido Günther <agx@sigxcpu.org>
+
+diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
+index b12a49e..3a5a7e2 100644
+--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
+@@ -548,8 +548,6 @@ out:
+ }
+ 
+ 
+-/* XXX Is 10 the correct base for the Number/Class/SubClass/Protocol
+- * conversions?  */
+ static int udevProcessUSBInterface(struct udev_device *device,
+                                    virNodeDeviceDefPtr def)
+ {
+@@ -559,28 +557,28 @@ static int udevProcessUSBInterface(struct udev_device *device,
+     if (udevGetUintSysfsAttr(device,
+                              "bInterfaceNumber",
+                              &data->usb_if.number,
+-                             10) == PROPERTY_ERROR) {
+                             16) == PROPERTY_ERROR) {
+         goto out;
+     }
+ 
+     if (udevGetUintSysfsAttr(device,
+                              "bInterfaceClass",
+                              &data->usb_if._class,
+-                             10) == PROPERTY_ERROR) {
+                             16) == PROPERTY_ERROR) {
+         goto out;
+     }
+ 
+     if (udevGetUintSysfsAttr(device,
+                              "bInterfaceSubClass",
+                              &data->usb_if.subclass,
+-                             10) == PROPERTY_ERROR) {
+                             16) == PROPERTY_ERROR) {
+         goto out;
+     }
+ 
+     if (udevGetUintSysfsAttr(device,
+                              "bInterfaceProtocol",
+                              &data->usb_if.protocol,
+-                             10) == PROPERTY_ERROR) {
+                             16) == PROPERTY_ERROR) {
+         goto out;
+     }
+ 
@@ -0,0 +1,50 @@
+commit e984019688509605966c03cd77f4591d2cc222d3
+Author: Cole Robinson <crobinso@redhat.com>
+Date:   Fri Apr 30 18:14:35 2010 +0200
+
+    domain: Fix PCI address decimal parsing regression
+    
+    <hostdev> address parsing previously attempted to detect the number
+    base: currently it is hardcoded to base 16, which can break PCI
+    assignment via virt-manager. Revert to the previous behavior.
+    
+    * src/conf/domain_conf.c: virDomainDevicePCIAddressParseXML, switch to
+      virStrToLong_ui(bus, NULL, 0, ...) to autodetect base
+
+diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
+index 1607e8b..546ddf2 100644
+--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
+@@ -1079,28 +1079,28 @@ virDomainDevicePCIAddressParseXML(xmlNodePtr node,
+     function = virXMLPropString(node, "function");
+ 
+     if (domain &&
+-        virStrToLong_ui(domain, NULL, 16, &addr->domain) < 0) {
+        virStrToLong_ui(domain, NULL, 0, &addr->domain) < 0) {
+         virDomainReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                              _("Cannot parse <address> 'domain' attribute"));
+         goto cleanup;
+     }
+ 
+     if (bus &&
+-        virStrToLong_ui(bus, NULL, 16, &addr->bus) < 0) {
+        virStrToLong_ui(bus, NULL, 0, &addr->bus) < 0) {
+         virDomainReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                              _("Cannot parse <address> 'bus' attribute"));
+         goto cleanup;
+     }
+ 
+     if (slot &&
+-        virStrToLong_ui(slot, NULL, 16, &addr->slot) < 0) {
+        virStrToLong_ui(slot, NULL, 0, &addr->slot) < 0) {
+         virDomainReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                              _("Cannot parse <address> 'slot' attribute"));
+         goto cleanup;
+     }
+ 
+     if (function &&
+-        virStrToLong_ui(function, NULL, 16, &addr->function) < 0) {
+        virStrToLong_ui(function, NULL, 0, &addr->function) < 0) {
+         virDomainReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                              _("Cannot parse <address> 'function' attribute"));
+         goto cleanup;
@@ -0,0 +1,108 @@
+commit 83be64034a0b530c904ceb4fd1ed1c10b5cdf4bf
+Author: Cole Robinson <crobinso@redhat.com>
+Date:   Mon May 17 10:15:53 2010 -0400
+
+    qemu: Report cmdline output if VM dies early
+    
+    qemuReadLogOutput early VM death detection is racy and won't always work.
+    Startup then errors when connecting to the VM monitor. This won't report
+    the emulator cmdline output which is typically the most useful diagnostic.
+    
+    Check if the VM has died at the very end of the monitor connection step,
+    and if so, report the cmdline output.
+    
+    See also: https://bugzilla.redhat.com/show_bug.cgi?id=581381
+
+diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
+index ab6bec8..582fdee 100644
+--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
+@@ -2034,39 +2034,47 @@ static void qemudFreePtyPath(void *payload, const char *name ATTRIBUTE_UNUSED)
+     VIR_FREE(payload);
+ }
+ 
+static void
+qemuReadLogFD(int logfd, char *buf, int maxlen, int off)
+{
+    int ret;
+    char *tmpbuf = buf + off;
+
+    ret = saferead(logfd, tmpbuf, maxlen - off - 1);
+    if (ret < 0) {
+        ret = 0;
+    }
+
+    tmpbuf[ret] = '\0';
+}
+
+ static int
+ qemudWaitForMonitor(struct qemud_driver* driver,
+                     virDomainObjPtr vm, off_t pos)
+ {
+-    char buf[4096]; /* Plenty of space to get startup greeting */
+    char buf[4096] = ""; /* Plenty of space to get startup greeting */
+     int logfd;
+     int ret = -1;
+    virHashTablePtr paths = NULL;
+ 
+-    if ((logfd = qemudLogReadFD(driver->logDir, vm->def->name, pos))
+-        < 0)
+    if ((logfd = qemudLogReadFD(driver->logDir, vm->def->name, pos)) < 0)
+         return -1;
+ 
+-    ret = qemudReadLogOutput(vm, logfd, buf, sizeof(buf),
+-                             qemudFindCharDevicePTYs,
+-                             "console", 30);
+-    if (close(logfd) < 0) {
+-        char ebuf[4096];
+-        VIR_WARN(_("Unable to close logfile: %s"),
+-                 virStrerror(errno, ebuf, sizeof ebuf));
+-    }
+-
+-    if (ret < 0)
+-        return -1;
+    if (qemudReadLogOutput(vm, logfd, buf, sizeof(buf),
+                           qemudFindCharDevicePTYs,
+                           "console", 30) < 0)
+        goto closelog;
+ 
+     VIR_DEBUG("Connect monitor to %p '%s'", vm, vm->def->name);
+-    if (qemuConnectMonitor(driver, vm) < 0)
+-        return -1;
+    if (qemuConnectMonitor(driver, vm) < 0) {
+        goto cleanup;
+    }
+ 
+     /* Try to get the pty path mappings again via the monitor. This is much more
+      * reliable if it's available.
+      * Note that the monitor itself can be on a pty, so we still need to try the
+      * log output method. */
+-    virHashTablePtr paths = virHashCreate(0);
+    paths = virHashCreate(0);
+     if (paths == NULL) {
+         virReportOOMError();
+         goto cleanup;
+@@ -2087,6 +2095,23 @@ cleanup:
+         virHashFree(paths, qemudFreePtyPath);
+     }
+ 
+    if (kill(vm->pid, 0) == -1 && errno == ESRCH) {
+        /* VM is dead, any other error raised in the interim is probably
+         * not as important as the qemu cmdline output */
+        qemuReadLogFD(logfd, buf, sizeof(buf), strlen(buf));
+        qemuReportError(VIR_ERR_INTERNAL_ERROR,
+                        _("process exited while connecting to monitor: %s"),
+                        buf);
+        ret = -1;
+    }
+
+closelog:
+    if (close(logfd) < 0) {
+        char ebuf[4096];
+        VIR_WARN(_("Unable to close logfile: %s"),
+                 virStrerror(errno, ebuf, sizeof ebuf));
+    }
+
+     return ret;
+ }
+ 
@@ -0,0 +1,155 @@
+diff -rup libvirt-0.7.7/src/conf/storage_conf.c new/src/conf/storage_conf.c
+--- libvirt-0.7.7/src/conf/storage_conf.c	2010-03-05 09:46:29.000000000 -0500
+++ new/src/conf/storage_conf.c	2010-06-17 12:28:44.319588000 -0400
+@@ -601,6 +601,7 @@ virStoragePoolDefParseXML(xmlXPathContex
+     xmlNodePtr source_node;
+     char *type = NULL;
+     char *uuid = NULL;
+    char *tmppath;
+ 
+     if (VIR_ALLOC(ret) < 0) {
+         virReportOOMError();
+@@ -698,11 +699,16 @@ virStoragePoolDefParseXML(xmlXPathContex
+         }
+     }
+ 
+-    if ((ret->target.path = virXPathString("string(./target/path)", ctxt)) == NULL) {
+    if ((tmppath = virXPathString("string(./target/path)", ctxt)) == NULL) {
+         virStorageReportError(VIR_ERR_XML_ERROR,
+                               "%s", _("missing storage pool target path"));
+         goto cleanup;
+     }
+    ret->target.path = virFileSanitizePath(tmppath);
+    VIR_FREE(tmppath);
+    if (!ret->target.path)
+        goto cleanup;
+
+ 
+     if (virStorageDefParsePerms(ctxt, &ret->target.perms,
+                                 "./target/permissions", 0700) < 0)
+diff -rup libvirt-0.7.7/src/libvirt_private.syms new/src/libvirt_private.syms
+--- libvirt-0.7.7/src/libvirt_private.syms	2010-03-05 10:45:23.000000000 -0500
+++ new/src/libvirt_private.syms	2010-06-17 12:28:44.334585000 -0400
+@@ -582,6 +582,7 @@ virFileReadLimFD;
+ virFilePid;
+ virFileReadPid;
+ virFileLinkPointsTo;
+virFileSanitizePath;
+ virParseNumber;
+ virAsprintf;
+ virRun;
+diff -rup libvirt-0.7.7/src/storage/storage_driver.c new/src/storage/storage_driver.c
+--- libvirt-0.7.7/src/storage/storage_driver.c	2010-03-05 09:46:29.000000000 -0500
+++ new/src/storage/storage_driver.c	2010-06-17 12:28:44.346586000 -0400
+@@ -1200,6 +1200,11 @@ storageVolumeLookupByPath(virConnectPtr 
+     virStorageDriverStatePtr driver = conn->storagePrivateData;
+     unsigned int i;
+     virStorageVolPtr ret = NULL;
+    char *cleanpath;
+
+    cleanpath = virFileSanitizePath(path);
+    if (!cleanpath)
+        return NULL;
+ 
+     storageDriverLock(driver);
+     for (i = 0 ; i < driver->pools.count && !ret ; i++) {
+@@ -1209,7 +1214,7 @@ storageVolumeLookupByPath(virConnectPtr 
+             const char *stable_path;
+ 
+             stable_path = virStorageBackendStablePath(driver->pools.objs[i],
+-                                                      path);
+                                                      cleanpath);
+             /*
+              * virStorageBackendStablePath already does
+              * virStorageReportError if it fails; we just need to keep
+@@ -1238,6 +1243,7 @@ storageVolumeLookupByPath(virConnectPtr 
+                               "%s", _("no storage vol with matching path"));
+ 
+ cleanup:
+    VIR_FREE(cleanpath);
+     storageDriverUnlock(driver);
+     return ret;
+ }
+diff -rup libvirt-0.7.7/src/util/util.c new/src/util/util.c
+--- libvirt-0.7.7/src/util/util.c	2010-03-03 05:48:25.000000000 -0500
+++ new/src/util/util.c	2010-06-17 12:28:44.357588000 -0400
+@@ -1867,6 +1867,55 @@ int virFileAbsPath(const char *path, cha
+     return 0;
+ }
+ 
+/* Remove spurious / characters from a path. The result must be freed */
+char *
+virFileSanitizePath(const char *path)
+{
+    const char *cur = path;
+    char *cleanpath;
+    int idx = 0;
+
+    cleanpath = strdup(path);
+    if (!cleanpath) {
+        virReportOOMError();
+        return NULL;
+    }
+
+    /* Need to sanitize:
+     * //           -> //
+     * ///          -> /
+     * /../foo      -> /../foo
+     * /foo///bar/  -> /foo/bar
+     */
+
+    /* Starting with // is valid posix, but ///foo == /foo */
+    if (cur[0] == '/' && cur[1] == '/' && cur[2] != '/') {
+        idx = 2;
+        cur += 2;
+    }
+
+    /* Sanitize path in place */
+    while (*cur != '\0') {
+        if (*cur != '/') {
+            cleanpath[idx++] = *cur++;
+            continue;
+        }
+
+        /* Skip all extra / */
+        while (*++cur == '/')
+            continue;
+
+        /* Don't add a trailing / */
+        if (idx != 0 && *cur == '\0')
+            break;
+
+        cleanpath[idx++] = '/';
+    }
+    cleanpath[idx] = '\0';
+
+    return cleanpath;
+}
+
+ /* Like strtol, but produce an "int" result, and check more carefully.
+    Return 0 upon success;  return -1 to indicate failure.
+    When END_PTR is NULL, the byte after the final valid digit must be NUL.
+diff -rup libvirt-0.7.7/src/util/util.h new/src/util/util.h
+--- libvirt-0.7.7/src/util/util.h	2010-02-19 12:14:07.000000000 -0500
+++ new/src/util/util.h	2010-06-17 12:28:44.364585000 -0400
+@@ -109,6 +109,8 @@ char *virFindFileInPath(const char *file
+ 
+ int virFileExists(const char *path);
+ 
+char *virFileSanitizePath(const char *path);
+
+ enum {
+     VIR_FILE_OP_NONE        = 0,
+     VIR_FILE_OP_AS_UID      = (1 << 0),
+diff -rup libvirt-0.7.7/tests/storagepoolxml2xmlin/pool-dir.xml new/tests/storagepoolxml2xmlin/pool-dir.xml
+--- libvirt-0.7.7/tests/storagepoolxml2xmlin/pool-dir.xml	2009-12-22 04:37:57.000000000 -0500
+++ new/tests/storagepoolxml2xmlin/pool-dir.xml	2010-06-17 12:28:44.367585000 -0400
+@@ -7,7 +7,7 @@
+   <source>
+   </source>
+   <target>
+-    <path>/var/lib/libvirt/images</path>
+    <path>///var/////lib/libvirt/images//</path>
+     <permissions>
+       <mode>0700</mode>
+       <owner>0</owner>
@@ -0,0 +1,87 @@
+From 3f1aa08af6580c215d973bc6bf57f505dbf8b926 Mon Sep 17 00:00:00 2001
+From: Cole Robinson <crobinso@redhat.com>
+Date: Fri, 12 Mar 2010 13:38:39 -0500
+Subject: [PATCH] security: Set permissions for kernel/initrd
+
+Fixes URL installs when running virt-install as root on Fedora.
+---
+ src/qemu/qemu_security_dac.c    |   21 +++++++++++++++++++++
+ src/security/security_selinux.c |   16 ++++++++++++++++
+ 2 files changed, 37 insertions(+), 0 deletions(-)
+
+diff --git a/src/qemu/qemu_security_dac.c b/src/qemu/qemu_security_dac.c
+index 6911f48..1883fbe 100644
+--- a/src/qemu/qemu_security_dac.c
+++ b/src/qemu/qemu_security_dac.c
+@@ -332,6 +332,15 @@ qemuSecurityDACRestoreSecurityAllLabel(virDomainObjPtr vm)
+                                                      vm->def->disks[i]) < 0)
+             rc = -1;
+     }
+
+    if (vm->def->os.kernel &&
+        qemuSecurityDACRestoreSecurityFileLabel(vm->def->os.kernel) < 0)
+        rc = -1;
+
+    if (vm->def->os.initrd &&
+        qemuSecurityDACRestoreSecurityFileLabel(vm->def->os.initrd) < 0)
+        rc = -1;
+
+     return rc;
+ }
+ 
+@@ -356,6 +365,18 @@ qemuSecurityDACSetSecurityAllLabel(virDomainObjPtr vm)
+             return -1;
+     }
+ 
+    if (vm->def->os.kernel &&
+        qemuSecurityDACSetOwnership(vm->def->os.kernel,
+                                    driver->user,
+                                    driver->group) < 0)
+        return -1;
+
+    if (vm->def->os.initrd &&
+        qemuSecurityDACSetOwnership(vm->def->os.initrd,
+                                    driver->user,
+                                    driver->group) < 0)
+        return -1;
+
+     return 0;
+ }
+ 
+diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
+index b2c8581..975b315 100644
+--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
+@@ -616,6 +616,14 @@ SELinuxRestoreSecurityAllLabel(virDomainObjPtr vm)
+             rc = -1;
+     }
+ 
+    if (vm->def->os.kernel &&
+        SELinuxRestoreSecurityFileLabel(vm->def->os.kernel) < 0)
+        rc = -1;
+
+    if (vm->def->os.initrd &&
+        SELinuxRestoreSecurityFileLabel(vm->def->os.initrd) < 0)
+        rc = -1;
+
+     return rc;
+ }
+ 
+@@ -736,6 +744,14 @@ SELinuxSetSecurityAllLabel(virDomainObjPtr vm)
+             return -1;
+     }
+ 
+    if (vm->def->os.kernel &&
+        SELinuxSetFilecon(vm->def->os.kernel, default_content_context) < 0)
+        return -1;
+
+    if (vm->def->os.initrd &&
+        SELinuxSetFilecon(vm->def->os.initrd, default_content_context) < 0)
+        return -1;
+
+     return 0;
+ }
+ 
+-- 
+1.6.6.1
+
@@ -0,0 +1,66 @@
+commit 07f6c3a95f1caca368c8723b5b0a25ae2faa1ffe
+Author: David Allan <dallan@redhat.com>
+Date:   Thu May 27 10:44:02 2010 -0400
+
+    v2 of Cole's wlan support
+    
+    * Incorporated Jim's feedback (v1 & v2)
+    
+    * Moved case of DEVTYPE == "wlan" up as it's definitive that we have a network interface.
+    
+    * Made comment more detailed about the wired case to explain better
+      how it differentiates between wired network interfaces and USB
+      devices.
+
+diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
+index f0485f1..c437861 100644
+--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
+@@ -597,8 +597,15 @@ static int udevProcessNetworkInterface(struct udev_device *device,
+                                        virNodeDeviceDefPtr def)
+ {
+     int ret = -1;
+    const char *devtype = udev_device_get_devtype(device);
+     union _virNodeDevCapData *data = &def->caps->data;
+ 
+    if (devtype && STREQ(devtype, "wlan")) {
+        data->net.subtype = VIR_NODE_DEV_CAP_NET_80211;
+    } else {
+        data->net.subtype = VIR_NODE_DEV_CAP_NET_80203;
+    }
+
+     if (udevGetStringProperty(device,
+                               "INTERFACE",
+                               &data->net.ifname) == PROPERTY_ERROR) {
+@@ -1074,6 +1081,8 @@ static int udevGetDeviceType(struct udev_device *device,
+     int ret = 0;
+ 
+     devtype = udev_device_get_devtype(device);
+    VIR_DEBUG("Found device type '%s' for device '%s'",
+              NULLSTR(devtype), udev_device_get_sysname(device));
+ 
+     if (devtype != NULL && STREQ(devtype, "usb_device")) {
+         *type = VIR_NODE_DEV_CAP_USB_DEV;
+@@ -1105,13 +1114,20 @@ static int udevGetDeviceType(struct udev_device *device,
+         goto out;
+     }
+ 
+    if (devtype != NULL && STREQ(devtype, "wlan")) {
+        *type = VIR_NODE_DEV_CAP_NET;
+        goto out;
+    }
+
+     if (udevGetUintProperty(device, "PCI_CLASS", &tmp, 16) == PROPERTY_FOUND) {
+         *type = VIR_NODE_DEV_CAP_PCI_DEV;
+         goto out;
+     }
+ 
+-    /* It does not appear that network interfaces set the device type
+-     * property. */
+    /* It does not appear that wired network interfaces set the
+     * DEVTYPE property.  USB devices also have an INTERFACE property,
+     * but they do set DEVTYPE, so if devtype is NULL and the
+     * INTERFACE property exists, we have a network device. */
+     if (devtype == NULL &&
+         udevGetStringProperty(device,
+                               "INTERFACE",
@@ -1 +1 @@
-SHA512 (libvirt-10.6.0.tar.xz) = edec79e89669d5e9a46be35e0d6334a6ed3bbf32426679549bd998bde24cba52b0378843f41a3abb5d781ad53e2a6a54619a0bad3f168c11fb41736cc6af6568
+5f315b0bf20e3964f7657ba1e630cd67  libvirt-0.7.7.tar.gz
Author	SHA1	Message	Date
Cole Robinson	3d90c2f845	Add qemu.conf options for audio workaround Fix parsing certain USB sysfs files (bz 598272) Sanitize pool target paths (bz 494005) Add qemu.conf for clear emulator capabilities Prevent libvirtd inside a VM from breaking network access (bz 235961) Mention --all in 'virsh list' docs (bz 575512) Initscript fixes (bz 565238) List wireless interfaces via nodedev-list (bz 596928)	2010-06-17 17:42:36 +00:00
Cole Robinson	5c3e8a7ac0	Fix nodedev XML conversion errors (bz 591262) Fix PCI xml decimal parsing (bz 582752) Fix CDROM media connect/eject (bz 582005) Always report qemu startup output on error (bz 581381) Fix crash from 'virsh dominfo' if secdriver disabled (bz 581166)	2010-05-18 18:49:49 +00:00
Cole Robinson	09a86187e8	Fix slow storage volume allocation (bz 582356)	2010-04-20 19:39:41 +00:00
Cole Robinson	a8bac7d647	Fix USB devices by product with security enabled (bz 574136) Set kernel/initrd in security driver, fixes some URL installs (bz 566425)	2010-03-22 15:09:54 +00:00
Daniel Veillard	74d9fb3860	oops forgot to update sources too, Daniel	2010-03-05 17:11:45 +00:00
Daniel Veillard	1b3b9bf1cc	Upstream release of 0.7.7, Daniel	2010-03-05 16:59:20 +00:00
Adam Jackson	1d1a47ccaf	bump to appease cvs	2010-02-17 15:34:59 +00:00
Adam Jackson	14f81abaae	all of libvirt_test.la needs -ldl	2010-02-17 15:33:23 +00:00
Jesse Keating	6b3af81b0e	Initialize branch F-13 for libvirt	2010-02-17 01:56:25 +00:00