Bug fix for 249594, daniel

.cvsignore

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

Makefile

@@ -3,19 +3,4 @@
 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)
+include ../common/Makefile.common

branch

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

libvirt-0.6.4-svirt-sound.patch

@@ -1,33 +0,0 @@
---- 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-qemu.patch

@@ -0,0 +1,14 @@
+diff -rup libvirt-0.3.1.orig/src/qemu_conf.c libvirt-0.3.1.new/src/qemu_conf.c
+--- libvirt-0.3.1.orig/src/qemu_conf.c	2007-07-24 11:06:38.000000000 -0400
++++ libvirt-0.3.1.new/src/qemu_conf.c	2007-07-26 10:22:09.000000000 -0400
+@@ -1088,6 +1088,10 @@ static struct qemud_vm_def *qemudParseXM
+     if ((obj == NULL) || (obj->type != XPATH_STRING) ||
+         (obj->stringval == NULL) || (obj->stringval[0] == 0)) {
+         const char *defaultMachine = qemudDefaultMachineForArch(def->os.arch);
++        if (!defaultMachine) {
++            qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "unsupported arch %s", def->os.arch);
++            goto error;
++        }
+         if (strlen(defaultMachine) >= (QEMUD_OS_MACHINE_MAX_LEN-1)) {
+             qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s", "machine type too long");
+             goto error;

sources

@@ -1 +1 @@
-8c2c14a7695c9c661004bcfc6468d62d  libvirt-0.7.0.tar.gz
+9b8a2a917dbaa028dff9d7bb03ca36ae  libvirt-0.3.1.tar.gz