[PATCH 04/24] qemu: conf: Move 'nbd' and 'vxhs' tls config variables together with rest of tls setup
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/libvirtd_qemu.aug | 12 ++++++------
src/qemu/qemu_conf.h | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug
index 404498b611..7a6a33c77c 100644
--- a/src/qemu/libvirtd_qemu.aug
+++ b/src/qemu/libvirtd_qemu.aug
@@ -59,6 +59,12 @@ module Libvirtd_qemu =
| bool_entry "migrate_tls_x509_verify"
| str_entry "migrate_tls_x509_secret_uuid"
+ let vxhs_entry = bool_entry "vxhs_tls"
+ | str_entry "vxhs_tls_x509_cert_dir"
+
+ let nbd_entry = bool_entry "nbd_tls"
+ | str_entry "nbd_tls_x509_cert_dir"
+
let nogfx_entry = bool_entry "nographics_allow_host_audio"
let remote_display_entry = int_entry "remote_display_port_min"
@@ -121,12 +127,6 @@ module Libvirtd_qemu =
let memory_entry = str_entry "memory_backing_dir"
- let vxhs_entry = bool_entry "vxhs_tls"
- | str_entry "vxhs_tls_x509_cert_dir"
-
- let nbd_entry = bool_entry "nbd_tls"
- | str_entry "nbd_tls_x509_cert_dir"
-
let swtpm_entry = str_entry "swtpm_user"
| str_entry "swtpm_group"
diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index b9ef4551a3..4f54c136db 100644
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@@ -144,6 +144,12 @@ struct _virQEMUDriverConfig {
bool migrateTLSx509verifyPresent;
char *migrateTLSx509secretUUID;
+ bool vxhsTLS;
+ char *vxhsTLSx509certdir;
+
+ bool nbdTLS;
+ char *nbdTLSx509certdir;
+
unsigned int remotePortMin;
unsigned int remotePortMax;
@@ -208,12 +214,6 @@ struct _virQEMUDriverConfig {
char *memoryBackingDir;
- bool vxhsTLS;
- char *vxhsTLSx509certdir;
-
- bool nbdTLS;
- char *nbdTLSx509certdir;
-
uid_t swtpm_user;
gid_t swtpm_group;
--
2.26.2