diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e8942f19fafd4d3f2c72a65c15037d6e2245aec4..133c2a3ea9f6adfcb394fd8663654698fc7e3809 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 c032c5143374e08bf79a58461f1c6d9d6dd806eb..d1fc4b75670a5f99babdf4b0ecd74d847d077b0a 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 9c88f58a7d74c04756a4beddae5e7c6feaf4db4d..16def839b73e5e91a249a96f7feca5f489301342 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 1f2d22fb5f1e1b42c4cf7435bb87e94e5ed5a983..f74b4b3a0c00d443f1a9627e8488793363273003 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; } }