]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: group swtpm entry in augeas file
authorJán Tomko <jtomko@redhat.com>
Mon, 14 Jan 2019 20:18:26 +0000 (21:18 +0100)
committerJán Tomko <jtomko@redhat.com>
Thu, 17 Jan 2019 14:53:20 +0000 (15:53 +0100)
They are meant to be together.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
src/qemu/libvirtd_qemu.aug

index 434ae510a0520a6c7b2667a8cbab5cf882e8d453..28bd851411c784e3c7fef6c923a001fec34ab626 100644 (file)
@@ -122,8 +122,8 @@ module Libvirtd_qemu =
    let nbd_entry = bool_entry "nbd_tls"
                 | str_entry "nbd_tls_x509_cert_dir"
 
-   let swtpm_user_entry = str_entry "swtpm_user"
-   let swtpm_group_entry = str_entry "swtpm_group"
+   let swtpm_entry = str_entry "swtpm_user"
+                | str_entry "swtpm_group"
 
    (* Each entry in the config is one of the following ... *)
    let entry = default_tls_entry
@@ -145,8 +145,7 @@ module Libvirtd_qemu =
              | memory_entry
              | vxhs_entry
              | nbd_entry
-             | swtpm_user_entry
-             | swtpm_group_entry
+             | swtpm_entry
 
    let comment = [ label "#comment" . del /#[ \t]*/ "# " .  store /([^ \t\n][^\n]*)?/ . del /\n/ "\n" ]
    let empty = [ label "#empty" . eol ]