-diff -urp libvirt-2.1.0.orig/src/qemu/qemu_command.c libvirt-2.1.0/src/qemu/qemu_command.c
---- libvirt-2.1.0.orig/src/qemu/qemu_command.c 2016-08-20 10:12:37.332554000 +0000
-+++ libvirt-2.1.0/src/qemu/qemu_command.c 2016-08-20 10:13:30.288554000 +0000
-@@ -7519,6 +7519,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUD
+diff -ur libvirt-8.0.0.orig/src/qemu/qemu_command.c libvirt-8.0.0/src/qemu/qemu_command.c
+--- libvirt-8.0.0.orig/src/qemu/qemu_command.c 2022-01-23 12:17:21.722539037 +0100
++++ libvirt-8.0.0/src/qemu/qemu_command.c 2022-01-23 12:17:43.308582727 +0100
+@@ -8327,6 +8327,10 @@
virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
/* TODO: Support ACLs later */
+
}
- virCommandAddArg(cmd, "-vnc");
-diff -urp libvirt-2.1.0.orig/src/qemu/qemu.conf libvirt-2.1.0/src/qemu/qemu.conf
---- libvirt-2.1.0.orig/src/qemu/qemu.conf 2016-08-20 10:12:37.337554000 +0000
-+++ libvirt-2.1.0/src/qemu/qemu.conf 2016-08-20 10:13:30.289554000 +0000
-@@ -80,6 +80,15 @@
+ if (graphics->data.vnc.powerControl != VIR_TRISTATE_BOOL_ABSENT) {
+diff -ur libvirt-8.0.0.orig/src/qemu/qemu.conf libvirt-8.0.0/src/qemu/qemu.conf
+--- libvirt-8.0.0.orig/src/qemu/qemu.conf 2022-01-23 12:17:21.720539033 +0100
++++ libvirt-8.0.0/src/qemu/qemu.conf 2022-01-23 12:17:43.308582727 +0100
+@@ -147,6 +147,15 @@
#vnc_sasl = 1
# The default SASL configuration file is located in /etc/sasl/
# When running libvirtd unprivileged, it may be desirable to
# override the configs in this location. Set this parameter to
-diff -urp libvirt-2.1.0.orig/src/qemu/qemu_conf.c libvirt-2.1.0/src/qemu/qemu_conf.c
---- libvirt-2.1.0.orig/src/qemu/qemu_conf.c 2016-08-20 10:12:37.334554000 +0000
-+++ libvirt-2.1.0/src/qemu/qemu_conf.c 2016-08-20 10:15:22.160554000 +0000
-@@ -425,6 +425,8 @@ int virQEMUDriverConfigLoadFile(virQEMUD
- goto cleanup;
- if (virConfGetValueBool(conf, "nographics_allow_host_audio", &cfg->nogfxAllowHostAudio) < 0)
- goto cleanup;
+diff -ur libvirt-8.0.0.orig/src/qemu/qemu_conf.c libvirt-8.0.0/src/qemu/qemu_conf.c
+--- libvirt-8.0.0.orig/src/qemu/qemu_conf.c 2022-01-23 12:17:21.722539037 +0100
++++ libvirt-8.0.0/src/qemu/qemu_conf.c 2022-01-23 12:17:43.308582727 +0100
+@@ -450,6 +450,8 @@
+ return -1;
+ if (virConfGetValueBool(conf, "vnc_allow_host_audio", &cfg->vncAllowHostAudio) < 0)
+ return -1;
+ if (virConfGetValueBool(conf, "vnc_acl", &cfg->vncACL) < 0)
-+ goto cleanup;
++ return -1;
-
- if (virConfGetValueStringList(conf, "security_driver", true, &cfg->securityDriverNames) < 0)
-diff -urp libvirt-2.1.0.orig/src/qemu/qemu_conf.h libvirt-2.1.0/src/qemu/qemu_conf.h
---- libvirt-2.1.0.orig/src/qemu/qemu_conf.h 2016-08-20 10:12:37.334554000 +0000
-+++ libvirt-2.1.0/src/qemu/qemu_conf.h 2016-08-20 10:13:30.294554000 +0000
-@@ -113,6 +113,7 @@ struct _virQEMUDriverConfig {
- bool vncTLS;
+ if (cfg->vncPassword &&
+ strlen(cfg->vncPassword) > 8) {
+diff -ur libvirt-8.0.0.orig/src/qemu/qemu_conf.h libvirt-8.0.0/src/qemu/qemu_conf.h
+--- libvirt-8.0.0.orig/src/qemu/qemu_conf.h 2022-01-23 12:17:21.722539037 +0100
++++ libvirt-8.0.0/src/qemu/qemu_conf.h 2022-01-23 12:17:43.309582729 +0100
+@@ -114,6 +114,7 @@
bool vncTLSx509verify;
+ bool vncTLSx509verifyPresent;
bool vncSASL;
+ bool vncACL;
char *vncTLSx509certdir;
+ char *vncTLSx509secretUUID;
char *vncListen;
- char *vncPassword;