[libvirt] [PATCH] qemu augeas: Add spice_tls/spice_tls_x509_cert_dir

[Eric Blake]

On 05/24/2012 01:04 PM, Douglas Schilling Landgraf wrote:
> If vdsm is installed and configured in Fedora 17, we add the following
> items into qemu.conf:
> 
> spice_tls=1
> spice_tls_x509_cert_dir="/etc/pki/vdsm/libvirt-spice"
> 
> However, after this changes, augtool cannot identify qemu.conf anymore.
> ---
>  src/qemu/libvirtd_qemu.aug |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug
> index f6cec1f..49587bf 100644
> --- a/src/qemu/libvirtd_qemu.aug
> +++ b/src/qemu/libvirtd_qemu.aug
> @@ -35,6 +35,8 @@ module Libvirtd_qemu =
>                   | str_entry "security_driver"
>                   | bool_entry "security_default_confined"
>                   | bool_entry "security_require_confined"
> +                 | bool_entry "spice_tls"
> +                 | str_entry  "spice_tls_x509_cert_dir"
>                   | str_entry "user"
>                   | str_entry "group"
>                   | bool_entry "dynamic_ownership"

ACK but incomplete compared to qemu.conf.  I'm squashing the following
before pushing:

diff --git i/src/qemu/libvirtd_qemu.aug w/src/qemu/libvirtd_qemu.aug
index 49587bf..9120d4e 100644
--- i/src/qemu/libvirtd_qemu.aug
+++ w/src/qemu/libvirtd_qemu.aug
@@ -32,11 +32,13 @@ module Libvirtd_qemu =
                  | str_entry "vnc_password"
                  | bool_entry "vnc_sasl"
                  | str_entry "vnc_sasl_dir"
+                 | str_entry "spice_listen"
+                 | bool_entry "spice_tls"
+                 | str_entry  "spice_tls_x509_cert_dir"
+                 | str_entry "spice_passwd"
                  | str_entry "security_driver"
                  | bool_entry "security_default_confined"
                  | bool_entry "security_require_confined"
-                 | bool_entry "spice_tls"
-                 | str_entry  "spice_tls_x509_cert_dir"
                  | str_entry "user"
                  | str_entry "group"
                  | bool_entry "dynamic_ownership"
@@ -48,6 +50,7 @@ module Libvirtd_qemu =
                  | bool_entry "auto_dump_bypass_cache"
                  | bool_entry "auto_start_bypass_cache"
                  | str_entry "hugetlbfs_mount"
+                 | bool_entry "mac_filter"
                  | bool_entry "relaxed_acs_check"
                  | bool_entry "vnc_allow_host_audio"
                  | bool_entry "clear_emulator_capabilities"

-- 
Eric Blake   eblake at redhat.com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 620 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20120524/955f7577/attachment-0001.sig>