On 05/25/2012 06:36 AM, Daniel P. Berrange wrote:
From: "Daniel P. Berrange" <berrange(a)redhat.com>
Currently all the config options are listed under a 'vnc_entry'
group. Create a bunch of new groups & move options to the
right place
Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com>
---
src/qemu/libvirtd_qemu.aug | 31 ++++++++++++++++++++++---------
1 file changed, 22 insertions(+), 9 deletions(-)
Conditional ACK.
diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug
index 359f8f1..683aadb 100644
--- a/src/qemu/libvirtd_qemu.aug
+++ b/src/qemu/libvirtd_qemu.aug
@@ -32,11 +32,14 @@ module Libvirtd_qemu =
| str_entry "vnc_password"
| bool_entry "vnc_sasl"
| str_entry "vnc_sasl_dir"
- | str_entry "spice_listen"
+ | bool_entry "vnc_allow_host_audio"
Since you are re-ordering options here into logical groups, you should
also rearrange the order in which lines are listed in qemu.conf to
match. For example (although this is not all affected parameters):
diff --git i/src/qemu/qemu.conf w/src/qemu/qemu.conf
index c78d551..32622ca 100644
--- i/src/qemu/qemu.conf
+++ w/src/qemu/qemu.conf
@@ -87,6 +87,14 @@
#
#vnc_sasl_dir = "/some/directory/sasl2"
+# QEMU implements an extension for providing audio over a VNC connection,
+# though if your VNC client does not support it, your only chance for
getting
+# sound output is through regular audio backends. By default, libvirt will
+# disable all QEMU sound backends if using VNC, since they can cause
+# permissions issues. Enabling this option will make libvirtd honor the
+# QEMU_AUDIO_DRV environment variable when using VNC.
+#
+#vnc_allow_host_audio = 0
# SPICE is configured to listen on 127.0.0.1 by default.
@@ -266,16 +274,6 @@
#relaxed_acs_check = 1
-# QEMU implements an extension for providing audio over a VNC connection,
-# though if your VNC client does not support it, your only chance for
getting
-# sound output is through regular audio backends. By default, libvirt will
-# disable all QEMU sound backends if using VNC, since they can cause
-# permissions issues. Enabling this option will make libvirtd honor the
-# QEMU_AUDIO_DRV environment variable when using VNC.
-#
-#vnc_allow_host_audio = 0
-
-
# If clear_emulator_capabilities is enabled, libvirt will drop all
# privileged capabilities of the QEmu/KVM emulator. This is enabled by
# default.
--
Eric Blake eblake(a)redhat.com +1-919-301-3266
Libvirt virtualization library
http://libvirt.org