* src/xml.c: applied patch from Nobuhiro Itou to allow the

VNC port 5900 to be used with xend, it's an edge case.
Daniel
This commit is contained in:
Daniel Veillard 2007-03-08 08:55:56 +00:00
parent b412cfadb5
commit 1e95c63059
2 changed files with 7 additions and 2 deletions

View File

@ -1,3 +1,8 @@
Thu Mar 8 09:54:46 CET 2007 Daniel Veillard <veillard@redhat.com>
* src/xml.c: applied patch from Nobuhiro Itou to allow the
VNC port 5900 to be used with xend, it's an edge case.
Thu Mar 8 09:22:29 CET 2007 Daniel Veillard <veillard@redhat.com> Thu Mar 8 09:22:29 CET 2007 Daniel Veillard <veillard@redhat.com>
* include/libvirt/libvirt.h include/libvirt/libvirt.h.in * include/libvirt/libvirt.h include/libvirt/libvirt.h.in

View File

@ -251,7 +251,7 @@ static int virDomainParseXMLGraphicsDescImage(virConnectPtr conn ATTRIBUTE_UNUSE
long port = strtol((const char *)vncport, NULL, 10); long port = strtol((const char *)vncport, NULL, 10);
if (port == -1) if (port == -1)
virBufferAdd(buf, "(vncunused 1)", 13); virBufferAdd(buf, "(vncunused 1)", 13);
else if (port > 5900) else if (port >= 5900)
virBufferVSprintf(buf, "(vncdisplay %d)", port - 5900); virBufferVSprintf(buf, "(vncdisplay %d)", port - 5900);
xmlFree(vncport); xmlFree(vncport);
} }
@ -315,7 +315,7 @@ static int virDomainParseXMLGraphicsDescVFB(virConnectPtr conn ATTRIBUTE_UNUSED,
long port = strtol((const char *)vncport, NULL, 10); long port = strtol((const char *)vncport, NULL, 10);
if (port == -1) if (port == -1)
virBufferAdd(buf, "(vncunused 1)", 13); virBufferAdd(buf, "(vncunused 1)", 13);
else if (port > 5900) else if (port >= 5900)
virBufferVSprintf(buf, "(vncdisplay %d)", port - 5900); virBufferVSprintf(buf, "(vncdisplay %d)", port - 5900);
xmlFree(vncport); xmlFree(vncport);
} }