ia64/xen-unstable

changeset 7152:034ada135379

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@xensource.com>
author emellor@ewan
date Fri Sep 30 13:58:08 2005 +0100 (2005-09-30)
parents 4a2c162d3e7c
children fe401301929e
files linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c	Fri Sep 30 13:41:10 2005 +0100
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c	Fri Sep 30 13:58:08 2005 +0100
     1.3 @@ -184,7 +184,7 @@ static int xenbus_hotplug_backend(struct
     1.4  	return 0;
     1.5  }
     1.6  
     1.7 -static int xenbus_probe_backend(const char *type, const char *uuid);
     1.8 +static int xenbus_probe_backend(const char *type, const char *domid);
     1.9  static struct xen_bus_type xenbus_backend = {
    1.10  	.root = "backend",
    1.11  	.levels = 3, 		/* backend/type/<frontend>/<id> */
    1.12 @@ -419,15 +419,15 @@ static int xenbus_probe_backend_unit(con
    1.13  	return err;
    1.14  }
    1.15  
    1.16 -/* backend/<typename>/<frontend-uuid> */
    1.17 -static int xenbus_probe_backend(const char *type, const char *uuid)
    1.18 +/* backend/<typename>/<frontend-domid> */
    1.19 +static int xenbus_probe_backend(const char *type, const char *domid)
    1.20  {
    1.21  	char *nodename;
    1.22  	int err = 0;
    1.23  	char **dir;
    1.24  	unsigned int i, dir_n = 0;
    1.25  
    1.26 -	nodename = kasprintf("%s/%s/%s", xenbus_backend.root, type, uuid);
    1.27 +	nodename = kasprintf("%s/%s/%s", xenbus_backend.root, type, domid);
    1.28  	if (!nodename)
    1.29  		return -ENOMEM;
    1.30  
    1.31 @@ -607,6 +607,7 @@ void xenbus_suspend(void)
    1.32  	down(&xenbus_lock);
    1.33  	bus_for_each_dev(&xenbus_frontend.bus, NULL, NULL, suspend_dev);
    1.34  	bus_for_each_dev(&xenbus_backend.bus, NULL, NULL, suspend_dev);
    1.35 +	xb_suspend_comms();
    1.36  }
    1.37  
    1.38  void xenbus_resume(void)
    1.39 @@ -650,6 +651,7 @@ int do_xenbus_probe(void *unused)
    1.40  	int err = 0;
    1.41  
    1.42  	/* Initialize xenstore comms unless already done. */
    1.43 +	printk("store_evtchn = %i\n", xen_start_info->store_evtchn);
    1.44  	err = xs_init();
    1.45  	if (err) {
    1.46  		printk("XENBUS: Error initializing xenstore comms:"