* Thu Aug 6 2009 Mark McLoughlin <markmc@redhat.com> - 0.7.0-2

- Make sure qemu can access kernel/initrd (bug #516034)
- Set perms on /var/lib/libvirt/boot to 0711 (bug #516034)

.cvsignore

@@ -1,24 +1,14 @@
-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
-libvirt-0.2.3.tar.gz
-libvirt-0.3.0.tar.gz
-libvirt-0.3.1.tar.gz
-libvirt-0.3.2.tar.gz
-libvirt-0.3.3.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-0.1.gitf055724.tar.gz
+libvirt-0.7.0-0.6.gite195b43.tar.gz
+libvirt-0.7.0.tar.gz

branch

@@ -1 +0,0 @@
-F-8

libvirt-0.4.4-boot-cdrom.patch

@@ -1,99 +0,0 @@
-diff -rupN libvirt-0.4.4.orig/src/qemu_conf.c libvirt-0.4.4.new/src/qemu_conf.c
---- libvirt-0.4.4.orig/src/qemu_conf.c	2008-06-19 14:15:02.000000000 +0100
-+++ libvirt-0.4.4.new/src/qemu_conf.c	2008-07-08 12:24:07.000000000 +0100
-@@ -2616,7 +2616,8 @@ int qemudBuildCommandLine(virConnectPtr 
-                      disk->src, qemudBusIdToName(disk->bus, 1),
-                      media ? media : "",
-                      idx,
--                     bootable ? ",boot=on" : "");
-+                     bootable && disk->device == QEMUD_DISK_DISK
-+                     ? ",boot=on" : "");
- 
-             ADD_ARG_LIT("-drive");
-             ADD_ARG_LIT(opt);
-diff -rupN libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args
---- libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args	1970-01-01 01:00:00.000000000 +0100
-+++ libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args	2008-07-08 12:25:59.000000000 +0100
-@@ -0,0 +1 @@
-+/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot d -drive file=/dev/HostVG/QEMUGuest1,if=ide,index=0 -drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,index=2 -net none -serial none -parallel none -usb
-\ No newline at end of file
-diff -rupN libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml
---- libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml	1970-01-01 01:00:00.000000000 +0100
-+++ libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml	2008-07-08 12:20:42.000000000 +0100
-@@ -0,0 +1,26 @@
-+<domain type='qemu'>
-+  <name>QEMUGuest1</name>
-+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-+  <memory>219200</memory>
-+  <currentMemory>219200</currentMemory>
-+  <vcpu>1</vcpu>
-+  <os>
-+    <type arch='i686' machine='pc'>hvm</type>
-+    <boot dev='cdrom'/>
-+  </os>
-+  <clock offset='utc'/>
-+  <on_poweroff>destroy</on_poweroff>
-+  <on_reboot>restart</on_reboot>
-+  <on_crash>destroy</on_crash>
-+  <devices>
-+    <emulator>/usr/bin/qemu</emulator>
-+    <disk type='block' device='disk'>
-+      <source dev='/dev/HostVG/QEMUGuest1'/>
-+      <target dev='hda' bus='ide'/>
-+    </disk>
-+    <disk type='block' device='cdrom'>
-+      <source dev='/dev/HostVG/QEMUGuest2'/>
-+      <target dev='hdc' bus='ide'/>
-+    </disk>
-+  </devices>
-+</domain>
-diff -rupN libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args
---- libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args	1970-01-01 01:00:00.000000000 +0100
-+++ libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args	2008-07-08 12:13:15.000000000 +0100
-@@ -0,0 +1 @@
-+/usr/bin/qemu -S -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -drive file=/dev/HostVG/QEMUGuest1,if=ide,index=0,boot=on -drive file=/dev/HostVG/QEMUGuest2,if=ide,media=cdrom,index=2 -net none -serial none -parallel none -usb
-\ No newline at end of file
-diff -rupN libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml
---- libvirt-0.4.4.orig/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml	1970-01-01 01:00:00.000000000 +0100
-+++ libvirt-0.4.4.new/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml	2008-07-08 12:12:41.000000000 +0100
-@@ -0,0 +1,26 @@
-+<domain type='qemu'>
-+  <name>QEMUGuest1</name>
-+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-+  <memory>219200</memory>
-+  <currentMemory>219200</currentMemory>
-+  <vcpu>1</vcpu>
-+  <os>
-+    <type arch='i686' machine='pc'>hvm</type>
-+    <boot dev='hd'/>
-+  </os>
-+  <clock offset='utc'/>
-+  <on_poweroff>destroy</on_poweroff>
-+  <on_reboot>restart</on_reboot>
-+  <on_crash>destroy</on_crash>
-+  <devices>
-+    <emulator>/usr/bin/qemu</emulator>
-+    <disk type='block' device='disk'>
-+      <source dev='/dev/HostVG/QEMUGuest1'/>
-+      <target dev='hda' bus='ide'/>
-+    </disk>
-+    <disk type='block' device='cdrom'>
-+      <source dev='/dev/HostVG/QEMUGuest2'/>
-+      <target dev='hdc' bus='ide'/>
-+    </disk>
-+  </devices>
-+</domain>
-diff -rupN libvirt-0.4.4.orig/tests/qemuxml2argvtest.c libvirt-0.4.4.new/tests/qemuxml2argvtest.c
---- libvirt-0.4.4.orig/tests/qemuxml2argvtest.c	2008-06-02 10:16:46.000000000 +0100
-+++ libvirt-0.4.4.new/tests/qemuxml2argvtest.c	2008-07-08 12:21:53.000000000 +0100
-@@ -158,6 +158,10 @@ mymain(int argc, char **argv)
-             QEMUD_CMD_FLAG_DRIVE_BOOT);
-     DO_TEST("disk-xenvbd", QEMUD_CMD_FLAG_DRIVE |
-             QEMUD_CMD_FLAG_DRIVE_BOOT);
-+    DO_TEST("disk-drive-boot-disk", QEMUD_CMD_FLAG_DRIVE |
-+            QEMUD_CMD_FLAG_DRIVE_BOOT);
-+    DO_TEST("disk-drive-boot-cdrom", QEMUD_CMD_FLAG_DRIVE |
-+            QEMUD_CMD_FLAG_DRIVE_BOOT);
-     DO_TEST("graphics-vnc", 0);
-     DO_TEST("graphics-sdl", 0);
-     DO_TEST("input-usbmouse", 0);

libvirt-0.6.4-svirt-sound.patch

@@ -0,0 +1,33 @@
+--- src/qemu_conf.c.orig	2009-05-29 19:24:59.000000000 +0200
++++ src/qemu_conf.c	2009-05-29 19:19:39.000000000 +0200
+@@ -792,6 +792,20 @@ int qemudBuildCommandLine(virConnectPtr 
+     char uuid[VIR_UUID_STRING_BUFLEN];
+     char domid[50];
+     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 (def->nsounds &&
++            !soundWarned) {
++            soundWarned = 1;
++            VIR_WARN0("Sound cards for VMs are disabled while SELinux security model is active");
++        }
++    }
+ 
+     uname_normalize(&ut);
+ 
+@@ -1429,7 +1443,8 @@ int qemudBuildCommandLine(virConnectPtr 
+     }
+ 
+     /* Add sound hardware */
+-    if (def->nsounds) {
++    if (def->nsounds &&
++        !skipSound) {
+         int size = 100;
+         char *modstr;
+         if (VIR_ALLOC_N(modstr, size+1) < 0)

libvirt-0.7.0-chown-kernel-initrd-before-spawning-qemu.patch

@@ -0,0 +1,73 @@
+From: Mark McLoughlin <markmc@redhat.com>
+Subject: [PATCH] chown kernel/initrd before spawning qemu
+
+If we're running qemu unprivileged, we need to chown any supplied kernel
+or initrd before spawning it.
+
+* src/qemu_driver.c: rename qemuDomainSetDiskOwnership() to
+  qemuDomainSetFileOwnership(), pass it a path string instead of a disk
+  definition and use it for chowning the kernel/initrd in
+  qemuDomainSetAllDeviceOwnership()
+---
+ src/qemu_driver.c |   20 ++++++++++++--------
+ 1 files changed, 12 insertions(+), 8 deletions(-)
+
+diff --git a/src/qemu_driver.c b/src/qemu_driver.c
+index 412b68d..bd58435 100644
+--- a/src/qemu_driver.c
++++ b/src/qemu_driver.c
+@@ -1684,18 +1684,18 @@ static int qemuDomainSetHostdevOwnership(virConnectPtr conn,
+ 
+ }
+ 
+-static int qemuDomainSetDiskOwnership(virConnectPtr conn,
+-                                      virDomainDiskDefPtr def,
++static int qemuDomainSetFileOwnership(virConnectPtr conn,
++                                      const char *path,
+                                       uid_t uid, gid_t gid)
+ {
+ 
+-    if (!def->src)
++    if (!path)
+         return 0;
+ 
+-    VIR_DEBUG("Setting ownership on %s to %d:%d", def->src, uid, gid);
+-    if (chown(def->src, uid, gid) < 0) {
++    VIR_DEBUG("Setting ownership on %s to %d:%d", path, uid, gid);
++    if (chown(path, uid, gid) < 0) {
+         virReportSystemError(conn, errno, _("cannot set ownership on %s"),
+-                             def->src);
++                             path);
+         return -1;
+     }
+     return 0;
+@@ -1725,7 +1725,7 @@ static int qemuDomainSetDeviceOwnership(virConnectPtr conn,
+             (def->data.disk->readonly || def->data.disk->shared))
+             return 0;
+ 
+-        return qemuDomainSetDiskOwnership(conn, def->data.disk, uid, gid);
++        return qemuDomainSetFileOwnership(conn, def->data.disk->src, uid, gid);
+ 
+     case VIR_DOMAIN_DEVICE_HOSTDEV:
+         return qemuDomainSetHostdevOwnership(conn, def->data.hostdev, uid, gid);
+@@ -1753,12 +1753,16 @@ static int qemuDomainSetAllDeviceOwnership(virConnectPtr conn,
+     uid = restore ? 0 : driver->user;
+     gid = restore ? 0 : driver->group;
+ 
++    if (qemuDomainSetFileOwnership(conn, def->os.kernel, uid, gid) < 0 ||
++        qemuDomainSetFileOwnership(conn, def->os.initrd, uid, gid) < 0)
++        return -1;
++
+     for (i = 0 ; i < def->ndisks ; i++) {
+         if (restore &&
+             (def->disks[i]->readonly || def->disks[i]->shared))
+             continue;
+ 
+-        if (qemuDomainSetDiskOwnership(conn, def->disks[i], uid, gid) < 0)
++        if (qemuDomainSetFileOwnership(conn, def->disks[i]->src, uid, gid) < 0)
+             return -1;
+     }
+ 
+-- 
+1.6.2.5
+

sources

@@ -1 +1 @@
-9407900dc16e0ba9ea3eec3cf0a56674  libvirt-0.4.4.tar.gz
+8c2c14a7695c9c661004bcfc6468d62d  libvirt-0.7.0.tar.gz