External/libvirt
1
0
Fork 0
Code

qemu: conf: Move 'nbd' and 'vxhs' tls config variables together with rest of tls setup

Browse Source 
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Peter Krempa 2020-06-29 17:05:35 +02:00
parent 72fdba7ffd
commit 473b97abac
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/qemu/libvirtd_qemu.aug
View File

@ -59,6 +59,12 @@ module Libvirtd_qemu =
| bool_entry "migrate_tls_x509_verify" | bool_entry "migrate_tls_x509_verify"
| str_entry "migrate_tls_x509_secret_uuid" | 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 nogfx_entry = bool_entry "nographics_allow_host_audio"
let remote_display_entry = int_entry "remote_display_port_min" 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 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" let swtpm_entry = str_entry "swtpm_user"
| str_entry "swtpm_group" | str_entry "swtpm_group"

12
src/qemu/qemu_conf.h
View File

@ -144,6 +144,12 @@ struct _virQEMUDriverConfig {
bool migrateTLSx509verifyPresent; bool migrateTLSx509verifyPresent;
char *migrateTLSx509secretUUID; char *migrateTLSx509secretUUID;
bool vxhsTLS;
char *vxhsTLSx509certdir;
bool nbdTLS;
char *nbdTLSx509certdir;
unsigned int remotePortMin; unsigned int remotePortMin;
unsigned int remotePortMax; unsigned int remotePortMax;
@ -208,12 +214,6 @@ struct _virQEMUDriverConfig {
char *memoryBackingDir; char *memoryBackingDir;
bool vxhsTLS;
char *vxhsTLSx509certdir;
bool nbdTLS;
char *nbdTLSx509certdir;
uid_t swtpm_user; uid_t swtpm_user;
gid_t swtpm_group; gid_t swtpm_group;