NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu: fix augeas support for vnc_auto_unix_socket

Browse Source 
Fixes test failure that was overlooked after commit 1e1f7a8950.

* daemon/Makefile.am (check-local): Let 'make check' fail on error.
* daemon/test_libvirtd.aug: Move qemu-specific option...
* src/qemu/test_libvirtd_qemu.aug: ...into correct test.
* src/qemu/libvirtd_qemu.aug: Parse new option.
This commit is contained in:
Eric Blake 2011-01-28 13:52:20 -07:00
parent 30e21374ea
commit 6fc1159d94
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
daemon/Makefile.am
View File

@ -301,8 +301,9 @@ libvirtd.init: libvirtd.init.in $(top_builddir)/config.status
mv $@-t $@ mv $@-t $@
check-local: check-local:
test -x '$(AUGPARSE)' \ $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
&& '$(AUGPARSE)' -I $(srcdir) $(srcdir)/test_libvirtd.aug || : '$(AUGPARSE)' -I $(srcdir) $(srcdir)/test_libvirtd.aug; \
fi
else else

6
daemon/test_libvirtd.aug
View File

@ -271,9 +271,6 @@ log_filters=\"a\"
# Auditing: # Auditing:
audit_level = 2 audit_level = 2
# VNC socket
vnc_auto_unix_socket = 1
" "
test Libvirtd.lns get conf = test Libvirtd.lns get conf =
@ -552,6 +549,3 @@ vnc_auto_unix_socket = 1
{ "#empty" } { "#empty" }
{ "#comment" = "Auditing:" } { "#comment" = "Auditing:" }
{ "audit_level" = "2" } { "audit_level" = "2" }
{ "#empty" }
{ "#comment" = "VNC socket:" }
{ "vnc_auto_unix_socket" = "1" }

1
src/qemu/libvirtd_qemu.aug
View File

@ -23,6 +23,7 @@ module Libvirtd_qemu =
(* Config entry grouped by function - same order as example config *) (* Config entry grouped by function - same order as example config *)
let vnc_entry = str_entry "vnc_listen" let vnc_entry = str_entry "vnc_listen"
| bool_entry "vnc_auto_unix_socket"
| bool_entry "vnc_tls" | bool_entry "vnc_tls"
| str_entry "vnc_tls_x509_cert_dir" | str_entry "vnc_tls_x509_cert_dir"
| bool_entry "vnc_tls_x509_verify" | bool_entry "vnc_tls_x509_verify"

4
src/qemu/test_libvirtd_qemu.aug
View File

@ -109,6 +109,8 @@ vnc_allow_host_audio = 1
clear_emulator_capabilities = 0 clear_emulator_capabilities = 0
allow_disk_format_probing = 1 allow_disk_format_probing = 1
vnc_auto_unix_socket = 1
" "
test Libvirtd_qemu.lns get conf = test Libvirtd_qemu.lns get conf =
@ -228,3 +230,5 @@ allow_disk_format_probing = 1
{ "clear_emulator_capabilities" = "0" } { "clear_emulator_capabilities" = "0" }
{ "#empty" } { "#empty" }
{ "allow_disk_format_probing" = "1" } { "allow_disk_format_probing" = "1" }
{ "#empty" }
{ "vnc_auto_unix_socket" = "1" }