* 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

diff --git a/ChangeLog b/ChangeLog
index e4d7efff8f2aec31452b2d522572d561b5657173..c47b7cbb33b34b1330faa3ab5daf35ed6795df2d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * include/libvirt/libvirt.h include/libvirt/libvirt.h.in

diff --git a/src/xml.c b/src/xml.c
index 25e7566f6e662aae651cb3f848c35c871f69f5f2..4ec9fb746c3059b0488e2ae231b15db373e4e69d 100644 (file)
--- a/src/xml.c
+++ b/src/xml.c
@@ -251,7 +251,7 @@ static int virDomainParseXMLGraphicsDescImage(virConnectPtr conn ATTRIBUTE_UNUSE
                     long port = strtol((const char *)vncport, NULL, 10);
                     if (port == -1)
                         virBufferAdd(buf, "(vncunused 1)", 13);
-                    else if (port > 5900)
+                    else if (port >= 5900)
                         virBufferVSprintf(buf, "(vncdisplay %d)", port - 5900);
                     xmlFree(vncport);
                 }
@@ -315,7 +315,7 @@ static int virDomainParseXMLGraphicsDescVFB(virConnectPtr conn ATTRIBUTE_UNUSED,
                 long port = strtol((const char *)vncport, NULL, 10);
                 if (port == -1)
                     virBufferAdd(buf, "(vncunused 1)", 13);
-                else if (port > 5900)
+                else if (port >= 5900)
                     virBufferVSprintf(buf, "(vncdisplay %d)", port - 5900);
                 xmlFree(vncport);
             }