[libvirt] [PATCH v6 02/10] vnc: rename socketAutogenerated to socketFromConfig
Even though it's auto-generated it's based on qemu.conf option and listen type
address already uses "fromConfig" to carry this information. Following commits
will convert the socket to listen element so this rename is required because
there will be also an option to get socket auto-generated independently on the
qemu.conf option.
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
src/conf/domain_conf.c | 2 +-
src/conf/domain_conf.h | 2 +-
src/qemu/qemu_command.c | 2 +-
src/qemu/qemu_domain.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index e8942f1..133c2a3 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -21765,7 +21765,7 @@ virDomainGraphicsDefFormat(virBufferPtr buf,
switch (def->type) {
case VIR_DOMAIN_GRAPHICS_TYPE_VNC:
if (def->data.vnc.socket) {
- if (!def->data.vnc.socketAutogenerated ||
+ if (!def->data.vnc.socketFromConfig ||
!(flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE)) {
virBufferEscapeString(buf, " socket='%s'",
def->data.vnc.socket);
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index c032c51..d1fc4b7 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -1452,7 +1452,7 @@ struct _virDomainGraphicsDef {
bool autoport;
char *keymap;
char *socket;
- bool socketAutogenerated;
+ bool socketFromConfig;
virDomainGraphicsAuthDef auth;
int sharePolicy;
} vnc;
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 8523992..9f9a86d 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -7233,7 +7233,7 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPtr cfg,
"%s/vnc.sock", domainLibDir) < 0)
goto error;
- graphics->data.vnc.socketAutogenerated = true;
+ graphics->data.vnc.socketFromConfig = true;
}
virBufferAddLit(&opt, "unix:");
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 0a1c09a..f8ac008 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -2098,7 +2098,7 @@ qemuDomainRecheckInternalPaths(virDomainDefPtr def,
return -1;
}
else
- graphics->data.vnc.socketAutogenerated = true;
+ graphics->data.vnc.socketFromConfig = true;
}
}
--
2.8.3