From: Matthew Daley <mattjd@gmail.com>
Date: Thu, 31 Oct 2013 06:03:55 +0000 (+1300)
Subject: xencommons: write domain 0's domid to xenstore
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~6111
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=02ebea7768fe723deaa56c2cfcb860874544b47d;p=xen.git

xencommons: write domain 0's domid to xenstore

libvchan's init_xs_srv (server-side xenstore-related initialization)
expects to find the current domain's domid at this xenstore key. libxl
(and xend) write this for domains they create. Do the same for domain 0,
allowing the use of libvchan in dom0.

Signed-off-by: Matthew Daley <mattjd@gmail.com>
Acked-by: Roger Pau Monné <roger.pau@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---

diff --git a/tools/hotplug/Linux/init.d/xencommons b/tools/hotplug/Linux/init.d/xencommons
index a2e633b27a..4ebd636cc0 100644
--- a/tools/hotplug/Linux/init.d/xencommons
+++ b/tools/hotplug/Linux/init.d/xencommons
@@ -108,8 +108,9 @@ do_start () {
 		    exit 1
 		fi
 
-		echo Setting domain 0 name...
+		echo Setting domain 0 name and domid...
 		${BINDIR}/xenstore-write "/local/domain/0/name" "Domain-0"
+		${BINDIR}/xenstore-write "/local/domain/0/domid" 0
 	fi
 
 	echo Starting xenconsoled...
diff --git a/tools/hotplug/NetBSD/rc.d/xencommons b/tools/hotplug/NetBSD/rc.d/xencommons
index fe4c9acec3..b1c353100d 100644
--- a/tools/hotplug/NetBSD/rc.d/xencommons
+++ b/tools/hotplug/NetBSD/rc.d/xencommons
@@ -68,8 +68,9 @@ xen_startcmd()
 
 	printf "\n"
 
-	printf "Setting domain 0 name.\n"
+	printf "Setting domain 0 name and domid.\n"
 	${BINDIR}/xenstore-write "/local/domain/0/name" "Domain-0"
+	${BINDIR}/xenstore-write "/local/domain/0/domid" 0
 }
 
 xen_stop()