Don't try to label a disk with no path (e.g. empty cdrom) (bug #499569)

- Enable migration for qemu 0.10 (bug #499704)

.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,8 @@
+.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

.gitignore

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

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

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

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

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

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

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

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

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

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

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

0006-util-quieten-virSCSIHostGetUniqueId.patch

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

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

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

Makefile

@@ -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 $$/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)

branch

@@ -0,0 +1 @@
+F-11

libvirt-0.6.2-enable-qemu-0-10-migration.patch

@@ -0,0 +1,45 @@
+From: "Daniel P. Berrange" <berrange@redhat.com>
+To: libvir-list@redhat.com
+Date: Thu, 30 Apr 2009 15:09:05 +0100
+Subject: [libvirt] PATCH: Enable migration with QEMU >= 0.10.0
+
+The KVM migration code was added to QEMU for the 0.10.0 release, so we 
+should enable this in libvirt now.
+
+Daniel
+
+diff -r be7993675e07 src/qemu_conf.c
+--- a/src/qemu_conf.c	Thu Apr 30 14:49:27 2009 +0100
++++ b/src/qemu_conf.c	Thu Apr 30 15:08:45 2009 +0100
+@@ -472,16 +472,13 @@ int qemudExtractVersionInfo(const char *
+ 
+     /*
+      * Handling of -incoming arg with varying features
+-     *  -incoming tcp    (kvm >= 79)
+-     *  -incoming exec   (kvm >= 80)
++     *  -incoming tcp    (kvm >= 79, qemu >= 0.10.0)
++     *  -incoming exec   (kvm >= 80, qemu >= 0.10.0)
+      *  -incoming stdio  (all earlier kvm)
+      *
+      * NB, there was a pre-kvm-79 'tcp' support, but it
+      * was broken, because it blocked the monitor console
+      * while waiting for data, so pretend it doesn't exist
+-     *
+-     * XXX when next QEMU release after 0.9.1 arrives,
+-     * we'll need to add MIGRATE_QEMU_TCP/EXEC here too
+      */
+     if (kvm_version >= 79) {
+         flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_TCP;
+@@ -489,6 +486,9 @@ int qemudExtractVersionInfo(const char *
+             flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC;
+     } else if (kvm_version > 0) {
+         flags |= QEMUD_CMD_FLAG_MIGRATE_KVM_STDIO;
++    } else if (version >= 10000) {
++        flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_TCP;
++        flags |= QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC;
+     }
+ 
+     if (retversion)
+
+
+-- 

libvirt-0.6.2-fix-nosource-label.patch

@@ -0,0 +1,13 @@
+diff -rup libvirt-0.6.2/src/security_selinux.c new/src/security_selinux.c
+--- libvirt-0.6.2/src/security_selinux.c	2009-05-10 22:04:25.000000000 -0400
++++ new/src/security_selinux.c	2009-05-10 22:06:09.000000000 -0400
+@@ -338,6 +338,9 @@ SELinuxSetSecurityImageLabel(virConnectP
+ {
+     const virSecurityLabelDefPtr secdef = &vm->def->seclabel;
+ 
++    if (!disk->src)
++        return 0;
++
+     if (disk->shared) {
+         return SELinuxSetFilecon(conn, disk->src, default_image_context);
+     } else if (disk->readonly) {

libvirt-0.6.2-qemu-drive-format.patch

@@ -0,0 +1,26 @@
+From 0ae4c67ff5f1d24698c5cfc8a9719d333c892644 Mon Sep 17 00:00:00 2001
+From: Mark McLoughlin <markmc@redhat.com>
+Date: Thu, 16 Apr 2009 11:23:55 +0100
+Subject: [PATCH 1/3] qemu -drive takes format= not fmt=
+
+Seems like a simple typo - it has been "format=" since the flag
+was introduced, but we added it as "fmt=".
+
+Signed-off-by: Mark McLoughlin <markmc@redhat.com>
+---
+ src/qemu_conf.c                                    |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/qemu_conf.c b/src/qemu_conf.c
+index f36c927..6f9e610 100644
+--- a/src/qemu_conf.c
++++ b/src/qemu_conf.c
+@@ -1135,7 +1135,7 @@ int qemudBuildCommandLine(virConnectPtr conn,
+                 disk->device == VIR_DOMAIN_DISK_DEVICE_DISK)
+                 virBufferAddLit(&opt, ",boot=on");
+             if (disk->driverType)
+-                virBufferVSprintf(&opt, ",fmt=%s", disk->driverType);
++                virBufferVSprintf(&opt, ",format=%s", disk->driverType);
+ 
+             if (disk->cachemode) {
+                 const char *mode =

libvirt-0.6.2-shared-readonly-label.patch

@@ -0,0 +1,76 @@
+diff -rup libvirt-0.6.2/src/security_selinux.c libvirt-0.6.2.new/src/security_selinux.c
+--- libvirt-0.6.2/src/security_selinux.c	2009-04-03 15:36:56.000000000 +0100
++++ libvirt-0.6.2.new/src/security_selinux.c	2009-05-05 13:39:42.000000000 +0100
+@@ -24,11 +24,12 @@
+ #include "virterror_internal.h"
+ #include "util.h"
+ #include "memory.h"
+-
++#include "logging.h"
+ 
+ #define VIR_FROM_THIS VIR_FROM_SECURITY
+ 
+ static char default_domain_context[1024];
++static char default_content_context[1024];
+ static char default_image_context[1024];
+ #define SECURITY_SELINUX_VOID_DOI       "0"
+ #define SECURITY_SELINUX_NAME "selinux"
+@@ -148,8 +149,13 @@ SELinuxInitialize(virConnectPtr conn)
+     close(fd);
+ 
+     ptr = strchrnul(default_image_context, '\n');
+-    *ptr = '\0';
+-
++    if (*ptr == '\n') {
++        *ptr = '\0';
++        strcpy(default_content_context, ptr+1);
++        ptr = strchrnul(default_content_context, '\n');
++        if (*ptr == '\n')
++            *ptr = '\0';
++    }
+     return 0;
+ }
+ 
+@@ -275,6 +281,8 @@ SELinuxSetFilecon(virConnectPtr conn, co
+ {
+     char ebuf[1024];
+ 
++    VIR_INFO("Setting SELinux context on '%s' to '%s'", path, tcon);
++
+     if(setfilecon(path, tcon) < 0) {
+         virSecurityReportError(conn, VIR_ERR_ERROR,
+                                _("%s: unable to set security context "
+@@ -299,6 +307,8 @@ SELinuxRestoreSecurityImageLabel(virConn
+     char *newpath = NULL;
+     const char *path = disk->src;
+ 
++    /* Don't restore labels on readoly/shared disks, because
++     * other VMs may still be accessing these */
+     if (disk->readonly || disk->shared)
+         return 0;
+ 
+@@ -328,8 +338,13 @@ SELinuxSetSecurityImageLabel(virConnectP
+ {
+     const virSecurityLabelDefPtr secdef = &vm->def->seclabel;
+ 
+-    if (secdef->imagelabel)
++    if (disk->shared) {
++        return SELinuxSetFilecon(conn, disk->src, default_image_context);
++    } else if (disk->readonly) {
++        return SELinuxSetFilecon(conn, disk->src, default_content_context);
++    } else if (secdef->imagelabel) {
+         return SELinuxSetFilecon(conn, disk->src, secdef->imagelabel);
++    }
+ 
+     return 0;
+ }
+@@ -403,9 +418,6 @@ SELinuxSetSecurityLabel(virConnectPtr co
+ 
+     if (secdef->imagelabel) {
+         for (i = 0 ; i < vm->def->ndisks ; i++) {
+-            if (vm->def->disks[i]->readonly ||
+-                vm->def->disks[i]->shared) continue;
+-
+             if (SELinuxSetSecurityImageLabel(conn, vm, vm->def->disks[i]) < 0)
+                 return -1;
+         }

libvirt-0.6.2-svirt-sound.patch

@@ -0,0 +1,33 @@
+--- src/qemu_conf.c.orig	2009-04-02 11:50:10.000000000 +0200
++++ src/qemu_conf.c	2009-04-03 17:46:59.000000000 +0200
+@@ -779,6 +779,20 @@ int qemudBuildCommandLine(virConnectPtr 
+     char domid[50];
+     char *pidfile;
+     const char *cpu = NULL;
++    int skipSound = 0;
++
++    if (driver->securityDriver &&
++        driver->securityDriver->name &&
++        STREQ(driver->securityDriver->name, "selinux") &&
++        getuid() == 0) {
++        static int soundWarned = 0; 
++        skipSound = 1;
++        if (vm->def->nsounds &&
++            !soundWarned) {
++            soundWarned = 1;
++            VIR_WARN0("Sound cards for VMs are disabled while SELinux security model is active");
++        }
++    }
+ 
+     uname_normalize(&ut);
+ 
+@@ -1425,7 +1439,8 @@ int qemudBuildCommandLine(virConnectPtr 
+     }
+ 
+     /* Add sound hardware */
+-    if (vm->def->nsounds) {
++    if (vm->def->nsounds &&
++        !skipSound) {
+         int size = 100;
+         char *modstr;
+         if (VIR_ALLOC_N(modstr, size+1) < 0)

libvirt-0.6.3-hostdev-managed.patch

@@ -0,0 +1,45 @@
+From 3d7771e0570e09096ad9391a857dad48b150bc0c Mon Sep 17 00:00:00 2001
+From: Mark McLoughlin <markmc@redhat.com>
+Date: Wed, 6 May 2009 16:33:28 +0100
+Subject: [PATCH] Fix qemu driver's interpretation of <hostdev managed='yes'/>
+
+This change:
+
+  Tue Mar  3 08:55:13 GMT 2009 Daniel P. Berrange <berrange@redhat.com>
+
+       Don't try to detach & reset PCI devices while running test
+       suite for XML-> ARGV conversion.
+       * src/qemu_driver.c: Add qemuPrepareHostDevices() helper to
+       detach and reset PCI devices.
+       * src/qemu_conf.c: Don't detach & reset PCI devices while
+       building the command line argv
+
+accidentally did this:
+
+-            if (hostdev->managed) {
++        if (!hostdev->managed) {
+
+Which results in managed='yes' not causing the device to be
+detached when the guest is starting.
+
+Signed-off-by: Mark McLoughlin <markmc@redhat.com>
+---
+ src/qemu_driver.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/qemu_driver.c b/src/qemu_driver.c
+index 5898026..59312c0 100644
+--- a/src/qemu_driver.c
++++ b/src/qemu_driver.c
+@@ -1215,7 +1215,7 @@ static int qemuPrepareHostDevices(virConnectPtr conn,
+         if (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI)
+             continue;
+ 
+-        if (!hostdev->managed) {
++        if (hostdev->managed) {
+             pciDevice *dev = pciGetDevice(conn,
+                                           hostdev->source.subsys.u.pci.domain,
+                                           hostdev->source.subsys.u.pci.bus,
+-- 
+1.6.0.6
+

libvirt-0.6.3-refresh-qemu-caps.patch

@@ -0,0 +1,76 @@
+commit 0e51348cb9aeafe5e2fd6469a4bde0baa1eb8720
+Author: Cole Robinson <crobinso@redhat.com>
+Date:   Mon May 4 15:06:03 2009 -0400
+
+    Refresh QEMU driver capabilities for each getCapabilities call.
+    
+    Also fix up a couple issues where caps are accessed without locking
+    the driver structure.
+
+diff --git a/src/qemu_driver.c b/src/qemu_driver.c
+index 23ea961..790dac6 100644
+--- a/src/qemu_driver.c
++++ b/src/qemu_driver.c
+@@ -1885,10 +1885,12 @@ static int qemudGetNodeInfo(virConnectPtr conn,
+ 
+ static char *qemudGetCapabilities(virConnectPtr conn) {
+     struct qemud_driver *driver = conn->privateData;
+-    char *xml;
++    char *xml = NULL;
+ 
+     qemuDriverLock(driver);
+-    if ((xml = virCapabilitiesFormatXML(driver->caps)) == NULL)
++    virCapabilitiesFree(qemu_driver->caps);
++    if ((qemu_driver->caps = qemudCapsInit()) == NULL ||
++        (xml = virCapabilitiesFormatXML(driver->caps)) == NULL)
+         virReportOOMError(conn);
+     qemuDriverUnlock(driver);
+ 
+@@ -3169,20 +3171,26 @@ cleanup:
+     return ret;
+ }
+ 
+-static int qemudNodeGetSecurityModel(virConnectPtr conn, virSecurityModelPtr secmodel)
++static int qemudNodeGetSecurityModel(virConnectPtr conn,
++                                     virSecurityModelPtr secmodel)
+ {
+     struct qemud_driver *driver = (struct qemud_driver *)conn->privateData;
+     char *p;
++    int ret = 0;
+ 
+-    if (!driver->securityDriver)
+-        return -2;
++    qemuDriverLock(driver);
++    if (!driver->securityDriver) {
++        ret = -2;
++        goto cleanup;
++    }
+ 
+     p = driver->caps->host.secModel.model;
+     if (strlen(p) >= VIR_SECURITY_MODEL_BUFLEN-1) {
+         qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
+                          _("security model string exceeds max %d bytes"),
+                          VIR_SECURITY_MODEL_BUFLEN-1);
+-        return -1;
++        ret = -1;
++        goto cleanup;
+     }
+     strcpy(secmodel->model, p);
+ 
+@@ -3191,10 +3199,14 @@ static int qemudNodeGetSecurityModel(virConnectPtr conn, virSecurityModelPtr sec
+         qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
+                          _("security DOI string exceeds max %d bytes"),
+                          VIR_SECURITY_DOI_BUFLEN-1);
+-        return -1;
++        ret = -1;
++        goto cleanup;
+     }
+     strcpy(secmodel->doi, p);
+-    return 0;
++
++cleanup:
++    qemuDriverUnlock(driver);
++    return ret;
+ }
+ 
+ /* TODO: check seclabel restore */

sources

@@ -1 +1 @@
-SHA512 (libvirt-6.6.0.tar.xz) = 55091addcf43d3c0bdd50f9378b588351181d191272d5a19220a0babe0893c1f6e0f1e41a7f51b8c1fb8e2098236b273e1a18b81573f4008ee3cf65374ba9465
+3035b484861516a1cd425acef1e760e3  libvirt-0.6.2.tar.gz