From 1e95c630596cf6407919ce78ed79846b21406148 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Thu, 8 Mar 2007 08:55:56 +0000 Subject: [PATCH] * 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 --- ChangeLog | 5 +++++ src/xml.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e4d7efff8f..c47b7cbb33 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Mar 8 09:54:46 CET 2007 Daniel Veillard + + * 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 * include/libvirt/libvirt.h include/libvirt/libvirt.h.in diff --git a/src/xml.c b/src/xml.c index 25e7566f6e..4ec9fb746c 100644 --- 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); }