From 96d64e5e10016e43f8831262df6bd78c34e07ddf Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Wed, 29 Jun 2011 14:40:08 +0200 Subject: [PATCH] --- yaml --- r: 255267 b: refs/heads/master c: 149bb2fab547253e6359e76f1b86b95247110e68 h: refs/heads/master i: 255265: 05e0fabb75d3ca1c02a55cfa8ab85b988125c954 255263: 2f28d8e984f7c54866eed0d92e30b2c5f2a8e649 v: v3 --- [refs] | 2 +- trunk/drivers/xen/xenbus/xenbus_probe.c | 3 ++- trunk/drivers/xen/xenbus/xenbus_probe_backend.c | 3 +++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 606d62ef9434..e00512550352 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cc85e93342c030f8ba07f572afa159ec4518231f +refs/heads/master: 149bb2fab547253e6359e76f1b86b95247110e68 diff --git a/trunk/drivers/xen/xenbus/xenbus_probe.c b/trunk/drivers/xen/xenbus/xenbus_probe.c index 2ed0b045c69a..bd2f90c9ac8b 100644 --- a/trunk/drivers/xen/xenbus/xenbus_probe.c +++ b/trunk/drivers/xen/xenbus/xenbus_probe.c @@ -393,7 +393,8 @@ static ssize_t devtype_show(struct device *dev, static ssize_t modalias_show(struct device *dev, struct device_attribute *attr, char *buf) { - return sprintf(buf, "xen:%s\n", to_xenbus_device(dev)->devicetype); + return sprintf(buf, "%s:%s\n", dev->bus->name, + to_xenbus_device(dev)->devicetype); } struct device_attribute xenbus_dev_attrs[] = { diff --git a/trunk/drivers/xen/xenbus/xenbus_probe_backend.c b/trunk/drivers/xen/xenbus/xenbus_probe_backend.c index ec510e562820..60adf919d78d 100644 --- a/trunk/drivers/xen/xenbus/xenbus_probe_backend.c +++ b/trunk/drivers/xen/xenbus/xenbus_probe_backend.c @@ -107,6 +107,9 @@ static int xenbus_uevent_backend(struct device *dev, if (xdev == NULL) return -ENODEV; + if (add_uevent_var(env, "MODALIAS=xen-backend:%s", xdev->devicetype)) + return -ENOMEM; + /* stuff we want to pass to /sbin/hotplug */ if (add_uevent_var(env, "XENBUS_TYPE=%s", xdev->devicetype)) return -ENOMEM;