qemu: fix augeas support for vnc_auto_unix_socket

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.

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 3ffb7bee7146f94c54a340e5aa6fa474b49d1acb..cdf0f75bd39ded9a7be88d52d614efb79b29c4cb 100644 (file)
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -301,8 +301,9 @@ libvirtd.init: libvirtd.init.in $(top_builddir)/config.status
            mv $@-t $@
 
 check-local:
-       test -x '$(AUGPARSE)' \
-         && '$(AUGPARSE)' -I $(srcdir) $(srcdir)/test_libvirtd.aug || :
+       $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
+         '$(AUGPARSE)' -I $(srcdir) $(srcdir)/test_libvirtd.aug; \
+       fi
 
 else
 

diff --git a/daemon/test_libvirtd.aug b/daemon/test_libvirtd.aug
index 31fa643c35a44666544146938247b50955d942e0..5f8b6446760af456c9494affdd53cf1c026a3c17 100644 (file)
--- a/daemon/test_libvirtd.aug
+++ b/daemon/test_libvirtd.aug
@@ -271,9 +271,6 @@ log_filters=\"a\"
 
 # Auditing:
 audit_level = 2
-
-# VNC socket
-vnc_auto_unix_socket = 1
 "
 
    test Libvirtd.lns get conf =
@@ -552,6 +549,3 @@ vnc_auto_unix_socket = 1
        { "#empty" }
         { "#comment" = "Auditing:" }
         { "audit_level" = "2" }
-        { "#empty" }
-        { "#comment" = "VNC socket:" }
-        { "vnc_auto_unix_socket" = "1" }

diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug
index 2f370158c39a418ae0d0e982ff41d6242872758f..affd74e502e8f6c01db4f0dfa3884f3ac5b6a742 100644 (file)
--- a/src/qemu/libvirtd_qemu.aug
+++ b/src/qemu/libvirtd_qemu.aug
@@ -23,6 +23,7 @@ module Libvirtd_qemu =
 
    (* Config entry grouped by function - same order as example config *)
    let vnc_entry = str_entry "vnc_listen"
+                 | bool_entry "vnc_auto_unix_socket"
                  | bool_entry "vnc_tls"
                  | str_entry "vnc_tls_x509_cert_dir"
                  | bool_entry "vnc_tls_x509_verify"

diff --git a/src/qemu/test_libvirtd_qemu.aug b/src/qemu/test_libvirtd_qemu.aug
index b4d8833c7eb3823768600e42e37f0627dc773f2e..8e477f5928d36b90d11bd3ed02671a9496fe23bc 100644 (file)
--- a/src/qemu/test_libvirtd_qemu.aug
+++ b/src/qemu/test_libvirtd_qemu.aug
@@ -109,6 +109,8 @@ vnc_allow_host_audio = 1
 clear_emulator_capabilities = 0
 
 allow_disk_format_probing = 1
+
+vnc_auto_unix_socket = 1
 "
 
    test Libvirtd_qemu.lns get conf =
@@ -228,3 +230,5 @@ allow_disk_format_probing = 1
 { "clear_emulator_capabilities" = "0" }
 { "#empty" }
 { "allow_disk_format_probing" = "1" }
+{ "#empty" }
+{ "vnc_auto_unix_socket" = "1" }