提交 17271d04 编写于 作者: P Pavel Hrdina

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: NPavel Hrdina <phrdina@redhat.com>
上级 fdff47c5
......@@ -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);
......
......@@ -1452,7 +1452,7 @@ struct _virDomainGraphicsDef {
bool autoport;
char *keymap;
char *socket;
bool socketAutogenerated;
bool socketFromConfig;
virDomainGraphicsAuthDef auth;
int sharePolicy;
} vnc;
......
......@@ -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:");
......
......@@ -2098,7 +2098,7 @@ qemuDomainRecheckInternalPaths(virDomainDefPtr def,
return -1;
}
else
graphics->data.vnc.socketAutogenerated = true;
graphics->data.vnc.socketFromConfig = true;
}
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册