From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ian Campbell <ian.campbell@citrix.com>
Subject: [PATCH 4 of 6] REBASE-4.1: xenops: update PV console
	path in xenstore
Date: Thu, 18 Nov 2010 10:50:26 +0000
Message-ID: <2e6a1485047a2e91c2e9.1290077426@zakaz.uk.xensource.com>
References: <patchbomb.1290077422@zakaz.uk.xensource.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xensource.com>
In-Reply-To: <patchbomb.1290077422@zakaz.uk.xensource.com>
List-Unsubscribe: <http://lists.xensource.com/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/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, xen-api@lists.xensource.com
Cc: Ian Campbell <ian.campbell@citrix.com>
List-Id: xen-devel@lists.xenproject.org

# HG changeset patch
# User root@localhost.localdomain
# Date 1290076616 18000
# Node ID 2e6a1485047a2e91c2e90d8ffdbf6c9a9814588c
# Parent  810786855fe641b7db0074cfcb2b2a3a4dfd34a0
REBASE-4.1: xenops: update PV console path in xenstore.

This was changed in more recent xenconsoled in order to better support multiple
consoles.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>

diff -r 810786855fe6 -r 2e6a1485047a ocaml/xenops/device.ml
--- a/ocaml/xenops/device.ml	Thu Nov 18 05:36:56 2010 -0500
+++ b/ocaml/xenops/device.ml	Thu Nov 18 05:36:56 2010 -0500
@@ -845,11 +845,11 @@ module PV_Vnc = struct
 
 let vncterm_wrapper = "/opt/xensource/libexec/vncterm-wrapper"
 
-let vnc_port_path domid = sprintf "/local/domain/%d/serial/0/vnc-port" domid
+let vnc_port_path domid = sprintf "/local/domain/%d/console/vnc-port" domid
 
 let pid ~xs domid =
 	try
-		let pid = xs.Xs.read (sprintf "/local/domain/%d/serial/0/vncterm-pid" domid) in
+		let pid = xs.Xs.read (sprintf "/local/domain/%d/console/vncterm-pid" domid) in
 		Some (int_of_string pid)
 	with _ ->
 		None
@@ -896,7 +896,7 @@ let save ~xs domid =
 let start ?statefile ~xs domid =
 	let l = [ string_of_int domid; (* absorbed by vncterm-wrapper *)
 		  (* everything else goes straight through to vncterm-wrapper: *)
-		  "-x"; sprintf "/local/domain/%d/serial/0" domid;
+		  "-x"; sprintf "/local/domain/%d/console" domid;
 		] @ load_args statefile in
 	(* Now add the close fds wrapper *)
 	let pid = Forkhelpers.safe_close_and_exec None None None [] vncterm_wrapper l in
diff -r 810786855fe6 -r 2e6a1485047a scripts/vncterm-wrapper
--- a/scripts/vncterm-wrapper	Thu Nov 18 05:36:56 2010 -0500
+++ b/scripts/vncterm-wrapper	Thu Nov 18 05:36:56 2010 -0500
@@ -39,9 +39,9 @@ else
 fi
 
 echo vncterm-wrapper:
-xenstore-write -s /local/domain/$DOMID/serial/0/vncterm-pid $$
+xenstore-write -s /local/domain/$DOMID/console/vncterm-pid $$
 if [ -z "${XIU}" ]; then
 	exec /usr/lib/xen/bin/vncterm $VNCTERM_LISTEN $VNCVIEWER $* > /dev/null 2>&1
 else
-	exec xenstore-write -s /local/domain/$DOMID/serial/0/vnc-port 0
+	exec xenstore-write -s /local/domain/$DOMID/console/vnc-port 0
 fi