rpms/libvirt/devel libvirt-0.6.1-svirt-sound.patch, NONE, 1.1 libvirt.spec, 1.120, 1.121
Daniel P. Berrange
berrange at fedoraproject.org
Tue Mar 17 16:01:25 UTC 2009
- Previous message: rpms/dbus-java/F-10 docs.patch, NONE, 1.1 missing_test_signal_interface_2.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 classpath_fix.patch, 1.1, 1.2 dbus-java.spec, 1.2, 1.3 sources, 1.2, 1.3 docbook.patch, 1.1, NONE man_fixes.patch, 1.1, NONE
- Next message: rpms/gentoo/devel gentoo.png, NONE, 1.1 .cvsignore, 1.5, 1.6 gentoo.desktop, 1.1, 1.2 gentoo.spec, 1.13, 1.14 sources, 1.5, 1.6 gentoo-0.11.56-lang.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: berrange
Update of /cvs/pkgs/rpms/libvirt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4081
Modified Files:
libvirt.spec
Added Files:
libvirt-0.6.1-svirt-sound.patch
Log Message:
Disable sound cards when running sVirt
libvirt-0.6.1-svirt-sound.patch:
--- NEW FILE libvirt-0.6.1-svirt-sound.patch ---
diff -rup libvirt-0.6.1.orig/src/qemu_conf.c libvirt-0.6.1.new/src/qemu_conf.c
--- libvirt-0.6.1.orig/src/qemu_conf.c 2009-03-17 11:57:04.000000000 +0000
+++ libvirt-0.6.1.new/src/qemu_conf.c 2009-03-17 15:50:08.000000000 +0000
@@ -757,6 +757,20 @@ int qemudBuildCommandLine(virConnectPtr
char uuid[VIR_UUID_STRING_BUFLEN];
char domid[50];
char *pidfile;
+ int skipSound = 0;
+
+ if (driver->securityDriver &&
+ driver->securityDriver->name &&
+ STREQ(driver->securityDriver->name, "selinux") &&
+ getuid == 0) {
+ static int soundWarned = 0;
+ skipSound = 1;
+ if (vm->def->nsounds &&
+ !soundWarned) {
+ soundWarned = 1;
+ VIR_WARN0("Sound cards for VMs are disabled while SELinux security model is active");
+ }
+ }
uname_normalize(&ut);
@@ -1364,7 +1378,8 @@ int qemudBuildCommandLine(virConnectPtr
}
/* Add sound hardware */
- if (vm->def->nsounds) {
+ if (vm->def->nsounds &&
+ !skipSound) {
int size = 100;
char *modstr;
if (VIR_ALLOC_N(modstr, size+1) < 0)
Only in libvirt-0.6.1.new/src: qemu_conf.c~
Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- libvirt.spec 17 Mar 2009 15:31:31 -0000 1.120
+++ libvirt.spec 17 Mar 2009 16:00:54 -0000 1.121
@@ -66,6 +66,10 @@
# Not upstream yet - pending QEMU merge
Patch100: libvirt-0.6.1-vnc-sasl-auth.patch
+# Not for upstream. Temporary hack till PulseAudio autostart
+# problems are sorted out when SELinux enforcing
+Patch200: libvirt-0.6.1-svirt-sound.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
URL: http://libvirt.org/
BuildRequires: python python-devel
@@ -209,6 +213,7 @@
%patch11 -p1
%patch100 -p1
+%patch200 -p1
mv NEWS NEWS.old
iconv -f ISO-8859-1 -t UTF-8 < NEWS.old > NEWS
@@ -503,6 +508,7 @@
%changelog
* Tue Mar 17 2009 Daniel P. Berrange <berrange at redhat.com> - 0.6.1-5.fc11
- Don't relabel shared/readonly disks
+- Disable sound cards when running sVirt
* Tue Mar 17 2009 Daniel P. Berrange <berrange at redhat.com> - 0.6.1-4.fc11
- Fix memory allocation for xend lookup
- Previous message: rpms/dbus-java/F-10 docs.patch, NONE, 1.1 missing_test_signal_interface_2.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 classpath_fix.patch, 1.1, 1.2 dbus-java.spec, 1.2, 1.3 sources, 1.2, 1.3 docbook.patch, 1.1, NONE man_fixes.patch, 1.1, NONE
- Next message: rpms/gentoo/devel gentoo.png, NONE, 1.1 .cvsignore, 1.5, 1.6 gentoo.desktop, 1.1, 1.2 gentoo.spec, 1.13, 1.14 sources, 1.5, 1.6 gentoo-0.11.56-lang.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list