From: kfraser@localhost.localdomain <kfraser@localhost.localdomain>
Date: Thu, 17 Aug 2006 15:22:08 +0000 (+0100)
Subject: [HVM] Avoid accessing start_info from xenbus as far as possible, since
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15710^2~62
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a8475c2e49132a237761dbea4e8f084d0f1d51e4;p=xen.git

[HVM] Avoid accessing start_info from xenbus as far as possible, since
HVM domains do things slightly differently.
Signed-off-by: Steven Smith <ssmith@xensource.com>
---

diff --git a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c
index 3decb3d2bc..2d42be1599 100644
--- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c
+++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c
@@ -962,7 +962,7 @@ static int xsd_port_read(char *page, char **start, off_t off,
 
 static int __init xenbus_probe_init(void)
 {
-	int err = 0, dom0;
+	int err = 0;
 	unsigned long page = 0;
 
 	DPRINTK("");
@@ -977,9 +977,7 @@ static int __init xenbus_probe_init(void)
 	/*
 	 * Domain0 doesn't have a store_evtchn or store_mfn yet.
 	 */
-	dom0 = (xen_start_info->store_evtchn == 0);
-
-	if (dom0) {
+	if (is_initial_xendomain()) {
 		struct evtchn_alloc_unbound alloc_unbound;
 
 		/* Allocate page. */
@@ -1037,7 +1035,7 @@ static int __init xenbus_probe_init(void)
 	device_register(&xenbus_frontend.dev);
 	device_register(&xenbus_backend.dev);
 
-	if (!dom0)
+	if (!is_initial_xendomain())
 		xenbus_probe(NULL);
 
 	return 0;