From e2106f6db9beb9f48e9f87f8a1eaba821d1a2296 Mon Sep 17 00:00:00 2001

From: Daniel P. Berrange <berrange@redhat.com>

Date: Mon, 17 Aug 2009 08:32:08 +0100

Subject: [PATCH] Disable sound cards when running sVirt

Temporary hack till PulseAudio autostart problems are sorted out when

SELinux enforcing (bz 486112)

Fedora-patch: libvirt-0.6.4-svirt-sound.patch

---

 src/qemu_conf.c |   17 ++++++++++++++++-

 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/src/qemu_conf.c b/src/qemu_conf.c

index f92bcef..f3b4ef0 100644

--- a/src/qemu_conf.c

+++ b/src/qemu_conf.c

@@ -1510,6 +1510,20 @@ int qemudBuildCommandLine(virConnectPtr conn,

     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);

@@ -2181,7 +2195,8 @@ int qemudBuildCommandLine(virConnectPtr conn,

     }

     /* Add sound hardware */

-    if (def->nsounds) {

+    if (def->nsounds &&

+        !skipSound) {

         int size = 100;

         char *modstr;

         if (VIR_ALLOC_N(modstr, size+1) < 0)

-- 

1.6.2.5