External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-02 18:05:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix formatting of XML for an inactive guest

Browse Source 
If the virDomainDefPtr object has an 'id' of -1, then forcably
set the VIR_DOMAIN_XML_INACTIVE flag to ensure generated XML
does not include any cruft from the previously running guest
such as console PTY path, or VNC port.

* src/conf/domain_conf.c: Set VIR_DOMAIN_XML_INACTIVE if
  def->id is -1. Replace checks for def->id == -1 with
  check against flags & VIR_DOMAIN_XML_INACTIVE.
This commit is contained in:
Daniel P. Berrange 2009-11-12 14:08:43 +00:00
parent e6cbadd588
commit f24e67d24f
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/conf/domain_conf.c
View File

@ -4408,7 +4408,6 @@ virDomainInputDefFormat(virConnectPtr conn,
static int static int
virDomainGraphicsDefFormat(virConnectPtr conn, virDomainGraphicsDefFormat(virConnectPtr conn,
virBufferPtr buf, virBufferPtr buf,
virDomainDefPtr vm,
virDomainGraphicsDefPtr def, virDomainGraphicsDefPtr def,
int flags) int flags)
{ {
@ -4425,7 +4424,7 @@ virDomainGraphicsDefFormat(virConnectPtr conn,
switch (def->type) { switch (def->type) {
case VIR_DOMAIN_GRAPHICS_TYPE_VNC: case VIR_DOMAIN_GRAPHICS_TYPE_VNC:
if (def->data.vnc.port && if (def->data.vnc.port &&
(!def->data.vnc.autoport || vm->id != -1)) (!def->data.vnc.autoport || !(flags & VIR_DOMAIN_XML_INACTIVE)))
virBufferVSprintf(buf, " port='%d'", virBufferVSprintf(buf, " port='%d'",
def->data.vnc.port); def->data.vnc.port);
else if (def->data.vnc.autoport) else if (def->data.vnc.autoport)
@ -4580,7 +4579,10 @@ char *virDomainDefFormat(virConnectPtr conn,
goto cleanup; goto cleanup;
} }
if (def->id >= 0) if (def->id == -1)
flags |= VIR_DOMAIN_XML_INACTIVE;
if (!(flags & VIR_DOMAIN_XML_INACTIVE))
virBufferVSprintf(&buf, "<domain type='%s' id='%d'>\n", type, def->id); virBufferVSprintf(&buf, "<domain type='%s' id='%d'>\n", type, def->id);
else else
virBufferVSprintf(&buf, "<domain type='%s'>\n", type); virBufferVSprintf(&buf, "<domain type='%s'>\n", type);
@ -4771,7 +4773,7 @@ char *virDomainDefFormat(virConnectPtr conn,
goto cleanup; goto cleanup;
for (n = 0 ; n < def->ngraphics ; n++) for (n = 0 ; n < def->ngraphics ; n++)
if (virDomainGraphicsDefFormat(conn, &buf, def, def->graphics[n], flags) < 0) if (virDomainGraphicsDefFormat(conn, &buf, def->graphics[n], flags) < 0)
goto cleanup; goto cleanup;
} }