External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-23 03:42:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

vnc: rename socketAutogenerated to socketFromConfig

Browse Source 
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@redhat.com>
This commit is contained in:
Pavel Hrdina 2016-06-08 13:24:52 +02:00
parent fdff47c587
commit 17271d04e7
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/conf/domain_conf.c
View File

@ -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);

2
src/conf/domain_conf.h
View File

@ -1452,7 +1452,7 @@ struct _virDomainGraphicsDef {
bool autoport;
char *keymap;
char *socket;
bool socketAutogenerated;
bool socketFromConfig;
virDomainGraphicsAuthDef auth;
int sharePolicy;
} vnc;

2
src/qemu/qemu_command.c
View File

@ -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:");

2
src/qemu/qemu_domain.c
View File

@ -2098,7 +2098,7 @@ qemuDomainRecheckInternalPaths(virDomainDefPtr def,
return -1;
}
else
graphics->data.vnc.socketAutogenerated = true;
graphics->data.vnc.socketFromConfig = true;
}
}