Fix USB devices by product with security enabled (bz 574136)

Set kernel/initrd in security driver, fixes some URL installs (bz 566425)

.cvsignore

@@ -1,19 +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
+.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
+libvirt-0.7.7.tar.gz

Makefile

@@ -3,4 +3,19 @@
 NAME := libvirt
 SPECFILE = $(firstword $(wildcard *.spec))
 
-include ../common/Makefile.common
+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)

branch

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

libvirt-0.2.2-bridge-init.patch

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

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

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

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

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

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

libvirt-0.7.7-fix-usb-product.patch

@@ -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
+

libvirt-0.7.7-set-kernel-perms.patch

@@ -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
+

sources

@@ -1 +1 @@
-3b9e192de1777c8ec801d16cbf1c7819  libvirt-0.2.3.tar.gz
+5f315b0bf20e3964f7657ba1e630cd67  libvirt-0.7.7.tar.gz