From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ben Guthro <bguthro@virtualiron.com>
Subject: [PATCH] Fix vnc port offset in xenstore
Date: Wed, 06 Jun 2007 12:05:00 -0400
Message-ID: <4666DB2C.9000707@virtualiron.com>
References: <9392A06CB0FDC847B3A530B3DC174E7B02A95EDB@mse10be1.mse10.exchange.ms>
	<4666DA1C.4010708@virtualiron.com>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="------------050307020401010303080702"
Return-path: <xen-devel-bounces@lists.xensource.com>
In-Reply-To: <4666DA1C.4010708@virtualiron.com>
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel@lists.xensource.com
List-Id: xen-devel@lists.xenproject.org

This is a multi-part message in MIME format.
--------------050307020401010303080702
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit

vnc-port-offset.patch:
    The new version of qemu uses 5900 instead of 0 as the port.
There is no need to offset it by 5900 when writing out the
console/vnc-port entry.

Signed-off-by: Ben Guthro <bguthro@virtualiron.com>

--------------050307020401010303080702
Content-Type: text/x-patch;
 name="vnc-port-offset.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="vnc-port-offset.patch"

diff -r a5cca7226e8a tools/ioemu/patches/xenstore-write-vnc-port
--- a/tools/ioemu/patches/xenstore-write-vnc-port	Tue Jun 05 13:32:38 2007 -0400
+++ b/tools/ioemu/patches/xenstore-write-vnc-port	Wed Jun 06 10:19:00 2007 -0400
@@ -23,7 +23,7 @@ Index: ioemu/xenstore.c
 +    if (pasprintf(&buf, "%s/console/vnc-port", path) == -1)
 +        goto out;
 +
-+    if (pasprintf(&portstr, "%d", 5900 + display) == -1)
++    if (pasprintf(&portstr, "%d", display) == -1)
 +        goto out;
 +
 +    if (xs_write(xsh, XBT_NULL, buf, portstr, strlen(portstr)) == 0)
diff -r a5cca7226e8a tools/ioemu/xenstore.c
--- a/tools/ioemu/xenstore.c	Tue Jun 05 13:32:38 2007 -0400
+++ b/tools/ioemu/xenstore.c	Wed Jun 06 10:17:08 2007 -0400
@@ -367,7 +367,7 @@ void xenstore_write_vncport(int display)
     if (pasprintf(&buf, "%s/console/vnc-port", path) == -1)
         goto out;
 
-    if (pasprintf(&portstr, "%d", 5900 + display) == -1)
+    if (pasprintf(&portstr, "%d", display) == -1)
         goto out;
 
     if (xs_write(xsh, XBT_NULL, buf, portstr, strlen(portstr)) == 0)

--------------050307020401010303080702
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

--------------050307020401010303080702--