rpms/libvirt/devel libvirt-0.6.4-svirt-sound.patch, NONE, 1.1 libvirt.spec, 1.137, 1.138 libvirt-0.6.2-fix-nosource-label.patch, 1.1, NONE libvirt-0.6.3-svirt-sound.patch, 1.3, NONE

[Daniel Veillard]

Author: veillard

Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15117

Modified Files:
	libvirt.spec 
Added Files:
	libvirt-0.6.4-svirt-sound.patch 
Removed Files:
	libvirt-0.6.2-fix-nosource-label.patch 
	libvirt-0.6.3-svirt-sound.patch 
Log Message:
Old patch didn't apply in kodji ??? Daniel


libvirt-0.6.4-svirt-sound.patch:

--- NEW FILE libvirt-0.6.4-svirt-sound.patch ---
--- 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)


Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -p -r1.137 -r1.138
--- libvirt.spec	29 May 2009 16:57:14 -0000	1.137
+++ libvirt.spec	29 May 2009 17:28:28 -0000	1.138
@@ -66,7 +66,7 @@ Source: libvirt-%{version}.tar.gz
 
 # Temporary hack till PulseAudio autostart problems are sorted
 # out when SELinux enforcing (bz 486112)
-Patch200: libvirt-0.6.3-svirt-sound.patch
+Patch200: libvirt-0.6.4-svirt-sound.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/


--- libvirt-0.6.2-fix-nosource-label.patch DELETED ---


--- libvirt-0.6.3-svirt-sound.patch DELETED ---