# HG changeset patch
# User emellor@ewan
# Node ID 034ada135379666b6c20b30788b206c2daa1af11
# Parent 4a2c162d3e7caf3016fd728f7b0a63b997d09427
Update comment/variable names to reflect the fact that the backend paths now
contain the frontend domid, not the uuid. The actual functionality is the same,
because the ID is referred to by path level, so the change in semantics is not
a problem.
Signed-off-by: Ewan Mellor <ewan@xxxxxxxxxxxxx>
diff -r 4a2c162d3e7c -r 034ada135379
linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c
--- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c Fri Sep 30
12:41:10 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c Fri Sep 30
12:58:08 2005
@@ -184,7 +184,7 @@
return 0;
}
-static int xenbus_probe_backend(const char *type, const char *uuid);
+static int xenbus_probe_backend(const char *type, const char *domid);
static struct xen_bus_type xenbus_backend = {
.root = "backend",
.levels = 3, /* backend/type/<frontend>/<id> */
@@ -419,15 +419,15 @@
return err;
}
-/* backend/<typename>/<frontend-uuid> */
-static int xenbus_probe_backend(const char *type, const char *uuid)
+/* backend/<typename>/<frontend-domid> */
+static int xenbus_probe_backend(const char *type, const char *domid)
{
char *nodename;
int err = 0;
char **dir;
unsigned int i, dir_n = 0;
- nodename = kasprintf("%s/%s/%s", xenbus_backend.root, type, uuid);
+ nodename = kasprintf("%s/%s/%s", xenbus_backend.root, type, domid);
if (!nodename)
return -ENOMEM;
@@ -607,6 +607,7 @@
down(&xenbus_lock);
bus_for_each_dev(&xenbus_frontend.bus, NULL, NULL, suspend_dev);
bus_for_each_dev(&xenbus_backend.bus, NULL, NULL, suspend_dev);
+ xb_suspend_comms();
}
void xenbus_resume(void)
@@ -650,6 +651,7 @@
int err = 0;
/* Initialize xenstore comms unless already done. */
+ printk("store_evtchn = %i\n", xen_start_info->store_evtchn);
err = xs_init();
if (err) {
printk("XENBUS: Error initializing xenstore comms:"
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home