[fedora-virt-maint] rpms/libvirt/devel libvirt-disable-audio-backend.patch, NONE, 1.1 libvirt-fix-drv-supports-feature-bogus-error.patch, 1.1, 1.2 libvirt-fix-net-hotunplug-double-free.patch, 1.3, 1.4 libvirt-fix-pci-hostdev-hotunplug-leak.patch, 1.3, 1.4 libvirt-fix-qemu-raw-format-save.patch, 1.1, 1.2 libvirt-fix-usb-device-passthrough.patch, 1.1, 1.2 libvirt.spec, 1.184, 1.185 libvirt-0.6.4-svirt-sound.patch, 1.6, NONE

[Mark McLoughlin]

Author: markmc

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

Modified Files:
	libvirt-fix-drv-supports-feature-bogus-error.patch 
	libvirt-fix-net-hotunplug-double-free.patch 
	libvirt-fix-pci-hostdev-hotunplug-leak.patch 
	libvirt-fix-qemu-raw-format-save.patch 
	libvirt-fix-usb-device-passthrough.patch libvirt.spec 
Added Files:
	libvirt-disable-audio-backend.patch 
Removed Files:
	libvirt-0.6.4-svirt-sound.patch 
Log Message:
* Thu Oct  1 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-8
- Disable sound backend, even when selinux is disabled (#524499)


libvirt-disable-audio-backend.patch:
 qemud/libvirtd.sysconf |    8 ++++++++
 src/qemu_conf.c        |   15 ++++++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

--- NEW FILE libvirt-disable-audio-backend.patch ---
>From 4721ceb9b85daabe53804627473b06ced821c695 Mon Sep 17 00:00:00 2001
From: Daniel P. Berrange <berrange at redhat.com>
Date: Mon, 14 Sep 2009 11:23:20 +0100
Subject: [PATCH] Allow control over QEMU audio backend

When using VNC for graphics + keyboard + mouse, we shouldn't
then use the host OS for audio. Audio should go back over
VNC.

When using SDL for graphics, we should use the host OS for
audio since that's where the display is. We need to allow
certain QEMU env variables to be passed through to guest
too to allow choice of QEMU audio backend.

* qemud/libvirtd.sysconf: Mention QEMU/SDL audio env vars
* src/qemu_conf.c: Passthrough QEMU/SDL audio env for SDL display,
  disable host audio for VNC display

(cherry picked from commit b08e6d38ae7a0ed70300d7d82107f83fddb60f44)

Fedora-patch: libvirt-disable-audio-backend.patch
---
 qemud/libvirtd.sysconf |    8 ++++++++
 src/qemu_conf.c        |   14 ++++++++++++++
 2 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/qemud/libvirtd.sysconf b/qemud/libvirtd.sysconf
index fe4596a..28080a0 100644
--- a/qemud/libvirtd.sysconf
+++ b/qemud/libvirtd.sysconf
@@ -7,3 +7,11 @@
 
 # Override Kerberos service keytab for SASL/GSSAPI
 #KRB5_KTNAME=/etc/libvirt/krb5.tab
+
+# Override the QEMU/SDL default audio driver probing when
+# starting virtual machines using SDL graphics
+#
+# NB these have no effect for VMs using VNC
+#QEMU_AUDIO_DRV=sdl
+#
+#SDL_AUDIODRIVER=pulse
diff --git a/src/qemu_conf.c b/src/qemu_conf.c
index f92bcef..0dd0624 100644
--- a/src/qemu_conf.c
+++ b/src/qemu_conf.c
@@ -2109,6 +2109,13 @@ int qemudBuildCommandLine(virConnectPtr conn,
             ADD_ARG_LIT("-k");
             ADD_ARG_LIT(def->graphics[0]->data.vnc.keymap);
         }
+
+        /* QEMU implements a VNC extension for providing audio, so we
+         * set the audio backend to none, to prevent it opening the
+         * host OS audio devices since that causes security issues
+         * and is non-sensical when using VNC.
+         */
+        ADD_ENV_LIT("QEMU_AUDIO_DRV=none");
     } else if ((def->ngraphics == 1) &&
                def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_SDL) {
         char *xauth = NULL;
@@ -2131,6 +2138,13 @@ int qemudBuildCommandLine(virConnectPtr conn,
             ADD_ENV(display);
         if (def->graphics[0]->data.sdl.fullscreen)
             ADD_ARG_LIT("-full-screen");
+
+        /* If using SDL for video, then we should just let it
+         * use QEMU's host audio drivers, possibly SDL too
+         * User can set these two before starting libvirtd
+         */
+        ADD_ENV_COPY("QEMU_AUDIO_DRV");
+        ADD_ENV_COPY("SDL_AUDIODRIVER");
     }
 
     if (def->nvideos) {
-- 
1.6.2.5


libvirt-fix-drv-supports-feature-bogus-error.patch:
 libvirt.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Index: libvirt-fix-drv-supports-feature-bogus-error.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt-fix-drv-supports-feature-bogus-error.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvirt-fix-drv-supports-feature-bogus-error.patch	21 Sep 2009 15:32:34 -0000	1.1
+++ libvirt-fix-drv-supports-feature-bogus-error.patch	1 Oct 2009 08:35:17 -0000	1.2
@@ -1,4 +1,4 @@
-From 2f6e857ac7d6ed5cd417e684147dd9c98775ab3d Mon Sep 17 00:00:00 2001
+From 7692e1e19487c28454b1e5f6488d5574c70883f2 Mon Sep 17 00:00:00 2001
 From: Chris Lalancette <clalance at redhat.com>
 Date: Mon, 21 Sep 2009 14:53:31 +0200
 Subject: [PATCH] Don't do virSetConnError when virDrvSupportsFeature is successful.

libvirt-fix-net-hotunplug-double-free.patch:
 qemu_driver.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Index: libvirt-fix-net-hotunplug-double-free.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt-fix-net-hotunplug-double-free.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libvirt-fix-net-hotunplug-double-free.patch	21 Sep 2009 15:32:34 -0000	1.3
+++ libvirt-fix-net-hotunplug-double-free.patch	1 Oct 2009 08:35:17 -0000	1.4
@@ -1,4 +1,4 @@
-From d09ff3c35c29d14760d5ea03559042cc024e09ab Mon Sep 17 00:00:00 2001
+From ba585ed6cff624c6c0f1f9801382fd6846466ee0 Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Thu, 17 Sep 2009 15:31:08 +0100
 Subject: [PATCH] Fix net/disk hot-unplug segfault

libvirt-fix-pci-hostdev-hotunplug-leak.patch:
 qemu_driver.c |   21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

Index: libvirt-fix-pci-hostdev-hotunplug-leak.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt-fix-pci-hostdev-hotunplug-leak.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- libvirt-fix-pci-hostdev-hotunplug-leak.patch	21 Sep 2009 15:32:34 -0000	1.3
+++ libvirt-fix-pci-hostdev-hotunplug-leak.patch	1 Oct 2009 08:35:17 -0000	1.4
@@ -1,4 +1,4 @@
-From d04ac8624f5fabe7587982796f2e2161220b0fcc Mon Sep 17 00:00:00 2001
+From 17831d20051f8de8f1f7d661e8a23f4fe67c2153 Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Thu, 17 Sep 2009 15:32:45 +0100
 Subject: [PATCH] Fix leak in PCI hostdev hot-unplug

libvirt-fix-qemu-raw-format-save.patch:
 qemu_driver.c |   29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

Index: libvirt-fix-qemu-raw-format-save.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt-fix-qemu-raw-format-save.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvirt-fix-qemu-raw-format-save.patch	21 Sep 2009 15:32:34 -0000	1.1
+++ libvirt-fix-qemu-raw-format-save.patch	1 Oct 2009 08:35:17 -0000	1.2
@@ -1,4 +1,4 @@
-From e50c91fdcea5d81e3eb2051c05f4e51a16c3e692 Mon Sep 17 00:00:00 2001
+From f1be5a4714e194a84840343e0937fe62463a18dc Mon Sep 17 00:00:00 2001
 From: Charles Duffy <Charles_Duffy at dell.com>
 Date: Fri, 18 Sep 2009 11:32:35 -0500
 Subject: [PATCH] Prevent attempt to call cat -c during virDomainSave to raw

libvirt-fix-usb-device-passthrough.patch:
 security_selinux.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Index: libvirt-fix-usb-device-passthrough.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt-fix-usb-device-passthrough.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libvirt-fix-usb-device-passthrough.patch	30 Sep 2009 17:58:52 -0000	1.1
+++ libvirt-fix-usb-device-passthrough.patch	1 Oct 2009 08:35:18 -0000	1.2
@@ -1,4 +1,4 @@
-From 16f20706f8d2f113bb6a49f56e415c16d438183e Mon Sep 17 00:00:00 2001
+From 6b12148864cf6a1d22a2cf4e0e9c48e9946331cb Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Wed, 30 Sep 2009 18:37:03 +0100
 Subject: [PATCH] Fix USB device re-labelling
@@ -37,5 +37,5 @@ index bc295b1..b4dc153 100644
  
      case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI: {
 -- 
-1.6.4.4
+1.6.2.5
 


Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -p -r1.184 -r1.185
--- libvirt.spec	30 Sep 2009 17:58:52 -0000	1.184
+++ libvirt.spec	1 Oct 2009 08:35:19 -0000	1.185
@@ -151,15 +151,11 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.7.1
-Release: 7%{?dist}%{?extra_release}
+Release: 8%{?dist}%{?extra_release}
 License: LGPLv2+
 Group: Development/Libraries
 Source: http://libvirt.org/sources/libvirt-%{version}.tar.gz
 
-# Temporary hack till PulseAudio autostart problems are sorted
-# out when SELinux enforcing (bz 486112)
-Patch00: libvirt-0.6.4-svirt-sound.patch
-
 # A couple of hot-unplug memory handling fixes (#523953)
 Patch01: libvirt-fix-net-hotunplug-double-free.patch
 Patch02: libvirt-fix-pci-hostdev-hotunplug-leak.patch
@@ -173,6 +169,9 @@ Patch04: libvirt-fix-qemu-raw-format-sav
 # Fix USB device passthrough (#422683)
 Patch05: libvirt-fix-usb-device-passthrough.patch
 
+# Disable sound backend (#524499, #508317)
+Patch06: libvirt-disable-audio-backend.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/
 BuildRequires: python-devel
@@ -385,12 +384,12 @@ of recent versions of Linux (and other O
 %prep
 %setup -q
 
-%patch00 -p1
 %patch01 -p1
 %patch02 -p1
 %patch03 -p1
 %patch04 -p1
 %patch05 -p1
+%patch06 -p1
 
 %build
 %if ! %{with_xen}
@@ -781,6 +780,9 @@ fi
 %endif
 
 %changelog
+* Thu Oct  1 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-8
+- Disable sound backend, even when selinux is disabled (#524499)
+
 * Wed Sep 30 2009 Mark McLoughlin <markmc at redhat.com> - 0.7.1-7
 - Fix USB device passthrough (#522683)
 


--- libvirt-0.6.4-svirt-sound.patch DELETED ---