Update of libvirt with the new upstream release, Daniel

.abignore

@@ -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.*

.cvsignore

@@ -0,0 +1,19 @@
+libvirt-0.0.3.tar.gz
+libvirt-0.0.4.tar.gz
+libvirt-0.0.5.tar.gz
+libvirt-0.0.6.tar.gz
+libvirt-0.1.0.tar.gz
+libvirt-0.1.2.tar.gz
+libvirt-0.1.1.tar.gz
+libvirt-0.1.3.tar.gz
+libvirt-0.1.4.tar.gz
+libvirt-0.1.5.tar.gz
+libvirt-0.1.6.tar.gz
+libvirt-0.1.7.tar.gz
+libvirt-0.1.8.tar.gz
+libvirt-0.1.9.tar.gz
+libvirt-0.1.10.tar.gz
+libvirt-0.1.11.tar.gz
+libvirt-0.2.0.tar.gz
+libvirt-0.2.1.tar.gz
+libvirt-0.2.2.tar.gz

.gitignore

@@ -1,5 +0,0 @@
-.build*.log
-*.rpm
-i686
-x86_64
-libvirt-*.tar.xz

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

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

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

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

0003-network-force-re-creation-of-iptables-private-chains.patch

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

0004-systemd-start-libvirtd-after-firewalld-iptables-serv.patch

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

0005-libxl-fix-crash-when-initializing-driver.patch

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

Makefile

@@ -0,0 +1,6 @@
+# Makefile for source rpm: libvirt
+# $Id$
+NAME := libvirt
+SPECFILE = $(firstword $(wildcard *.spec))
+
+include ../common/Makefile.common

branch

@@ -0,0 +1 @@
+F-7

libvirt-0.2.2-bridge-init.patch

@@ -0,0 +1,17 @@
+diff -rup libvirt-0.2.2/qemud/conf.c libvirt-0.2.2.new/qemud/conf.c
+--- libvirt-0.2.2/qemud/conf.c	2007-05-14 10:38:52.000000000 -0400
++++ libvirt-0.2.2.new/qemud/conf.c	2007-05-14 10:38:34.000000000 -0400
+@@ -1151,6 +1151,12 @@ qemudNetworkIfaceConnect(struct qemud_se
+         goto error;
+     }
+ 
++    if (!server->brctl && (err = brInit(&server->brctl))) {
++        qemudReportError(server, VIR_ERR_INTERNAL_ERROR,
++                         "cannot initialize bridge support: %s", strerror(err));
++        goto error;
++    }
++
+     if ((err = brAddTap(server->brctl, brname,
+                         ifname, BR_IFNAME_MAXLEN, &tapfd))) {
+         qemudReportError(server, VIR_ERR_INTERNAL_ERROR,
+Only in libvirt-0.2.2.new/qemud: conf.c.orig

libvirt-0.2.2-disable-xm.patch

@@ -0,0 +1,15 @@
+diff -rup libvirt-0.2.2/src/xen_unified.c libvirt-0.2.2.new/src/xen_unified.c
+--- libvirt-0.2.2/src/xen_unified.c	2007-04-17 04:38:52.000000000 -0400
++++ libvirt-0.2.2.new/src/xen_unified.c	2007-05-01 16:49:54.000000000 -0400
+@@ -112,6 +112,11 @@ xenUnifiedOpen (virConnectPtr conn, cons
+     for (i = 0; i < nb_drivers; ++i) {
+         int failed_to_open = 1;
+ 
++        /* Only use XM driver for Xen <= 3.0.3 (ie xendConfigVersion <= 2) */
++        if (drivers[i] == &xenXMDriver &&
++            priv->xendConfigVersion > 2)
++            continue;
++
+         /* Ignore proxy for root */
+         if (i == proxy_offset && getuid() == 0)
+             continue;

libvirt-0.2.2-dnsmasq-order.patch

@@ -0,0 +1,23 @@
+diff -rup libvirt-0.2.2/qemud/qemud.c libvirt-0.2.2.new/qemud/qemud.c
+--- libvirt-0.2.2/qemud/qemud.c	2007-04-11 10:13:36.000000000 -0400
++++ libvirt-0.2.2.new/qemud/qemud.c	2007-05-01 16:51:15.000000000 -0400
+@@ -1110,6 +1110,7 @@ qemudBuildDnsmasqArgv(struct qemud_serve
+     len =
+         1 + /* dnsmasq */
+         1 + /* --keep-in-foreground */
++        1 + /* --strict-order */
+         1 + /* --bind-interfaces */
+         2 + /* --pid-file "" */
+         2 + /* --conf-file "" */
+@@ -1133,6 +1134,11 @@ qemudBuildDnsmasqArgv(struct qemud_serve
+     APPEND_ARG(*argv, i++, "dnsmasq");
+ 
+     APPEND_ARG(*argv, i++, "--keep-in-foreground");
++    /*
++     * Needed to ensure dnsmasq uses same algorithm for processing
++     * multiple nameserver entries in /etc/resolv.conf as GLibC.
++     */
++    APPEND_ARG(*argv, i++, "--strict-order");
+     APPEND_ARG(*argv, i++, "--bind-interfaces");
+ 
+     APPEND_ARG(*argv, i++, "--pid-file");

libvirt-0.2.2-graphics-hvm.patch

@@ -0,0 +1,70 @@
+diff -rup libvirt-0.2.2.new/src/xend_internal.c libvirt-0.2.2/src/xend_internal.c
+--- libvirt-0.2.2.new/src/xend_internal.c	2007-04-15 16:09:10.000000000 -0400
++++ libvirt-0.2.2/src/xend_internal.c	2007-05-03 14:52:42.000000000 -0400
+@@ -1676,35 +1676,38 @@ xend_parse_sexp_desc(virConnectPtr conn,
+         }
+     }
+ 
+-    /* Graphics device (HVM <= 3.0.4, or PV <= 3.0.4) vnc config */
+-    tmp = sexpr_fmt_node(root, "domain/image/%s/vnc", hvm ? "hvm" : "linux");
+-    if (tmp != NULL) {
+-        if (tmp[0] == '1') {
+-            int port = xenStoreDomainGetVNCPort(conn, domid);
+-            const char *listenAddr = sexpr_fmt_node(root, "domain/image/%s/vnclisten", hvm ? "hvm" : "linux");
+-            const char *keymap = sexpr_fmt_node(root, "domain/image/%s/keymap", hvm ? "hvm" : "linux");
+-            /* For Xen >= 3.0.3, don't generate a fixed port mapping
+-             * because it will almost certainly be wrong ! Just leave
+-             * it as -1 which lets caller see that the VNC server isn't
+-             * present yet. Subsquent dumps of the XML will eventually
+-             * find the port in XenStore once VNC server has started
+-             */
+-            if (port == -1 && xendConfigVersion < 2)
+-                port = 5900 + domid;
+-            virBufferVSprintf(&buf, "    <graphics type='vnc' port='%d'", port);
+-            if (listenAddr)
+-                virBufferVSprintf(&buf, " listen='%s'", listenAddr);
+-            if (keymap)
+-                virBufferVSprintf(&buf, " keymap='%s'", keymap);
+-            virBufferAdd(&buf, "/>\n", 3);
++    /* Graphics device (HVM <= 3.0.4, or PV <= 3.0.3) vnc config */
++    if ((hvm && xendConfigVersion < 4) ||
++        (!hvm && xendConfigVersion < 3)) {
++        tmp = sexpr_fmt_node(root, "domain/image/%s/vnc", hvm ? "hvm" : "linux");
++        if (tmp != NULL) {
++            if (tmp[0] == '1') {
++                int port = xenStoreDomainGetVNCPort(conn, domid);
++                const char *listenAddr = sexpr_fmt_node(root, "domain/image/%s/vnclisten", hvm ? "hvm" : "linux");
++                const char *keymap = sexpr_fmt_node(root, "domain/image/%s/keymap", hvm ? "hvm" : "linux");
++                /* For Xen >= 3.0.3, don't generate a fixed port mapping
++                 * because it will almost certainly be wrong ! Just leave
++                 * it as -1 which lets caller see that the VNC server isn't
++                 * present yet. Subsquent dumps of the XML will eventually
++                 * find the port in XenStore once VNC server has started
++                 */
++                if (port == -1 && xendConfigVersion < 2)
++                    port = 5900 + domid;
++                virBufferVSprintf(&buf, "    <graphics type='vnc' port='%d'", port);
++                if (listenAddr)
++                    virBufferVSprintf(&buf, " listen='%s'", listenAddr);
++                if (keymap)
++                    virBufferVSprintf(&buf, " keymap='%s'", keymap);
++                virBufferAdd(&buf, "/>\n", 3);
++            }
+         }
+-    }
+ 
+-    /* Graphics device (HVM, or old (pre-3.0.4) style PV sdl config) */
+-    tmp = sexpr_fmt_node(root, "domain/image/%s/sdl", hvm ? "hvm" : "linux");
+-    if (tmp != NULL) {
+-        if (tmp[0] == '1')
+-            virBufferAdd(&buf, "    <graphics type='sdl'/>\n", 27 );
++        /* Graphics device (HVM, or old (pre-3.0.4) style PV sdl config) */
++        tmp = sexpr_fmt_node(root, "domain/image/%s/sdl", hvm ? "hvm" : "linux");
++        if (tmp != NULL) {
++            if (tmp[0] == '1')
++                virBufferAdd(&buf, "    <graphics type='sdl'/>\n", 27 );
++        }
+     }
+ 
+     tty = xenStoreDomainGetConsolePath(conn, domid);
+Only in libvirt-0.2.2/src: xend_internal.c.orig

libvirt-0.2.2-qemu-noreboot.patch

@@ -0,0 +1,128 @@
+diff -rup libvirt-0.2.2/qemud/conf.c libvirt-0.2.2.new/qemud/conf.c
+--- libvirt-0.2.2/qemud/conf.c	2007-04-17 04:34:42.000000000 -0400
++++ libvirt-0.2.2.new/qemud/conf.c	2007-05-14 10:36:12.000000000 -0400
+@@ -245,21 +245,25 @@ static int qemudExtractVersionInfo(const
+     cleanup1:
+         _exit(-1); /* Just in case */
+     } else { /* Parent */
+-        char help[4096]; /* Ought to be enough to hold QEMU help screen */
+-        int got, ret = -1;
++        char help[8192]; /* Ought to be enough to hold QEMU help screen */
++        int got = 0, ret = -1;
+         int major, minor, micro;
+ 
+         if (close(newstdout[1]) < 0)
+             goto cleanup2;
+ 
+-    reread:
+-        if ((got = read(newstdout[0], help, sizeof(help)-1)) < 0) {
+-            if (errno == EINTR)
+-                goto reread;
+-            goto cleanup2;
++        while (got < (sizeof(help)-1)) {
++            int len;
++            if ((len = read(newstdout[0], help+got, sizeof(help)-got-1)) <= 0) {
++                if (!len)
++                    break;
++                if (errno == EINTR)
++                    continue;
++                goto cleanup2;
++            }
++            got += len;
+         }
+         help[got] = '\0';
+-
+         if (sscanf(help, "QEMU PC emulator version %d.%d.%d", &major,&minor, &micro) != 3) {
+             goto cleanup2;
+         }
+@@ -267,6 +271,8 @@ static int qemudExtractVersionInfo(const
+         *version = (major * 1000 * 1000) + (minor * 1000) + micro;
+         if (strstr(help, "-no-kqemu"))
+             *flags |= QEMUD_CMD_FLAG_KQEMU;
++        if (strstr(help, "-no-reboot"))
++            *flags |= QEMUD_CMD_FLAG_NO_REBOOT;
+         if (*version >= 9000)
+             *flags |= QEMUD_CMD_FLAG_VNC_COLON;
+         ret = 0;
+@@ -858,6 +864,22 @@ static struct qemud_vm_def *qemudParseXM
+     }
+     xmlXPathFreeObject(obj);
+ 
++
++    /* See if we disable reboots */
++    obj = xmlXPathEval(BAD_CAST "string(/domain/on_reboot)", ctxt);
++    if ((obj == NULL) || (obj->type != XPATH_STRING) ||
++        (obj->stringval == NULL) || (obj->stringval[0] == 0)) {
++        def->noReboot = 0;
++    } else {
++        if (!strcmp((char*)obj->stringval, "destroy"))
++            def->noReboot = 1;
++        else
++            def->noReboot = 0;
++    }
++    if (obj)
++        xmlXPathFreeObject(obj);
++
++
+     /* Extract OS type info */
+     obj = xmlXPathEval(BAD_CAST "string(/domain/os/type[1])", ctxt);
+     if ((obj == NULL) || (obj->type != XPATH_STRING) ||
+@@ -1220,6 +1242,8 @@ int qemudBuildCommandLine(struct qemud_s
+         2 + /* cpus */
+         2 + /* boot device */
+         2 + /* monitor */
++        (server->qemuCmdFlags & QEMUD_CMD_FLAG_NO_REBOOT &&
++         vm->def->noReboot ? 1 : 0) + /* no-reboot */
+         (vm->def->features & QEMUD_FEATURE_ACPI ? 0 : 1) + /* acpi */
+         (vm->def->os.kernel[0] ? 2 : 0) + /* kernel */
+         (vm->def->os.initrd[0] ? 2 : 0) + /* initrd */
+@@ -1255,6 +1279,11 @@ int qemudBuildCommandLine(struct qemud_s
+         goto no_memory;
+     if (!((*argv)[++n] = strdup("pty")))
+         goto no_memory;
++    if (server->qemuCmdFlags & QEMUD_CMD_FLAG_NO_REBOOT &&
++        vm->def->noReboot) {
++        if (!((*argv)[++n] = strdup("-no-reboot")))
++            goto no_memory;
++    }
+ 
+     if (!(vm->def->features & QEMUD_FEATURE_ACPI)) {
+         if (!((*argv)[++n] = strdup("-no-acpi")))
+@@ -2517,6 +2546,17 @@ char *qemudGenerateXML(struct qemud_serv
+             goto no_memory;
+     }
+ 
++    if (bufferAdd(buf, "  <on_poweroff>destroy</on_poweroff>\n", -1) < 0)
++        goto no_memory;
++    if (def->noReboot) {
++        if (bufferAdd(buf, "  <on_reboot>destroy</on_reboot>\n", -1) < 0)
++            goto no_memory;
++    } else {
++        if (bufferAdd(buf, "  <on_reboot>restart</on_reboot>\n", -1) < 0)
++            goto no_memory;
++    }
++    if (bufferAdd(buf, "  <on_crash>destroy</on_crash>\n", -1) < 0)
++        goto no_memory;
+ 
+     if (bufferAdd(buf, "  <devices>\n", -1) < 0)
+         goto no_memory;
+diff -rup libvirt-0.2.2/qemud/internal.h libvirt-0.2.2.new/qemud/internal.h
+--- libvirt-0.2.2/qemud/internal.h	2007-04-11 10:13:36.000000000 -0400
++++ libvirt-0.2.2.new/qemud/internal.h	2007-05-14 10:36:02.000000000 -0400
+@@ -161,6 +161,7 @@ enum qemud_vm_grapics_type {
+ enum qemud_cmd_flags {
+     QEMUD_CMD_FLAG_KQEMU = 1,
+     QEMUD_CMD_FLAG_VNC_COLON = 2,
++    QEMUD_CMD_FLAG_NO_REBOOT = 4,
+ };
+ 
+ 
+@@ -191,6 +192,8 @@ struct qemud_vm_def {
+     int maxmem;
+     int vcpus;
+ 
++    int noReboot;
++
+     struct qemud_vm_os_def os;
+ 
+     int features;

libvirt-0.2.2-sync-daemon-restart.patch

@@ -0,0 +1,19 @@
+--- libvirt-0.2.2/ChangeLog.sync-restart	2007-05-02 13:07:21.719425000 -0400
++++ libvirt-0.2.2/ChangeLog	2007-05-02 13:08:23.204879000 -0400
+@@ -0,0 +1,5 @@
++Wed May  2 17:55:12 IST 2007 Mark McLoughlin <markmc@redhat.com>
++
++	* qemud/libvirtd.in: synchronously restart the daemon in
++	order to avoid https://bugzilla.redhat.com/238492
++	
+--- libvirt-0.2.2/qemud/libvirtd.in.sync-restart	2007-02-23 07:50:58.000000000 -0500
++++ libvirt-0.2.2/qemud/libvirtd.in	2007-05-02 13:08:23.209868000 -0400
+@@ -34,7 +34,7 @@
+ stop() {
+     echo -n $"Stopping $SERVICE daemon: "
+ 
+-    killproc $PROCESS -TERM
++    killproc $PROCESS
+     RETVAL=$?
+     echo
+     if [ $RETVAL -eq 0 ]; then

sources

@@ -1 +1 @@
-SHA512 (libvirt-6.1.0.tar.xz) = 17a2641f300a4a05149261bae74ac856e9a2511a259146595d2e2412c4a0601d88369b0544ba86edc80e433a47cf828317d8de38c6ec86a1b3efaca75294a606
+3b9e192de1777c8ec801d16cbf1c7819  libvirt-0.2.3.tar.gz