* Thu Jul 30 2009 Mark McLoughlin <markmc@redhat.com> - 0.7.0-0.8.gite195b43

- Add patch from upstream to fix qemu pidfile perms problem

.cvsignore

@@ -1,12 +1,13 @@
-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
+.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

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

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-fix-permissions-problem-starting-qemu.patch

@@ -0,0 +1,71 @@
+From: "Daniel P. Berrange" <berrange@redhat.com>
+Subject: PATCH: Fix permissions problem starting QEMU
+
+There is a minor bug when running QEMU non-root, and having
+capng enabled. libvirt is unable to write the PID file in
+/var/run/libvirt/qemu, since its now owned by 'qemu', but
+libvirtd has dropped all capabilties at this point. The fix
+is to delay dropping capabilities until after the PID file
+has been created. We should also be sure to kill the child
+if writing the PID file fails
+
+* src/util.c: Don't drop capabilities until after the PID file has
+  been written. Kill off child if writing the PID file fails
+
+* src/qemu_driver.c: Remove bogus trailing '/' in state dir
+
+diff --git a/src/qemu_driver.c b/src/qemu_driver.c
+index 9fb8506..26897d3 100644
+--- a/src/qemu_driver.c
++++ b/src/qemu_driver.c
+@@ -468,7 +468,7 @@ qemudStartup(int privileged) {
+             goto out_of_memory;
+ 
+         if (virAsprintf(&qemu_driver->stateDir,
+-                      "%s/run/libvirt/qemu/", LOCAL_STATE_DIR) == -1)
++                      "%s/run/libvirt/qemu", LOCAL_STATE_DIR) == -1)
+             goto out_of_memory;
+     } else {
+         uid_t uid = geteuid();
+diff --git a/src/util.c b/src/util.c
+index ee64b28..39aae24 100644
+--- a/src/util.c
++++ b/src/util.c
+@@ -513,12 +513,6 @@ __virExec(virConnectPtr conn,
+         if ((hook)(data) != 0)
+             _exit(1);
+ 
+-    /* The hook above may need todo something privileged, so
+-     * we delay clearing capabilities until now */
+-    if ((flags & VIR_EXEC_CLEAR_CAPS) &&
+-        virClearCapabilities() < 0)
+-        _exit(1);
+-
+     /* Daemonize as late as possible, so the parent process can detect
+      * the above errors with wait* */
+     if (flags & VIR_EXEC_DAEMON) {
+@@ -543,6 +537,9 @@ __virExec(virConnectPtr conn,
+ 
+         if (pid > 0) {
+             if (pidfile && virFileWritePidPath(pidfile,pid)) {
++                kill(pid, SIGTERM);
++                usleep(500*1000);
++                kill(pid, SIGTERM);
+                 virReportSystemError(conn, errno,
+                                      "%s", _("could not write pidfile"));
+                 _exit(1);
+@@ -551,6 +548,12 @@ __virExec(virConnectPtr conn,
+         }
+     }
+ 
++    /* The steps above may need todo something privileged, so
++     * we delay clearing capabilities until the last minute */
++    if ((flags & VIR_EXEC_CLEAR_CAPS) &&
++        virClearCapabilities() < 0)
++        _exit(1);
++
+     if (envp)
+         execve(argv[0], (char **) argv, (char**)envp);
+     else
+
+

sources

@@ -1 +1 @@
-0ce3b3fd9afbc81c446ca30355e08e75  libvirt-0.1.7.tar.gz
+30d52d580ad19473e80831ab1c222347  libvirt-0.7.0-0.6.gite195b43.tar.gz