On Mon, 2007-09-24 at 09:02 -0700, Greg KH wrote:
> On Mon, Sep 24, 2007 at 07:16:34PM +1000, Rusty Russell wrote:
> > This adds the logic to convert the virtio ids into module aliases, and
> > includes a modalias entry in sysfs.
> >
> > Unfortunately this does not seem sufficient to have the module
> > autoprobed at startup on my Ubuntu system. Greg? Am I missing some
> > udev magic?
>
> You also need to pass the MODINFO environment variable to the hotplug
> call so that udev can pick it up.
>
> hope this helps,
Well, I finally decoded this as follows:
You need to implement the bus_type.uevent hook, and use
add_uevent_var() to add a "MODALIAS=virtio:..." var. See
drivers/pci/hotplug.c.
Not sure why I need the modalias here when it's in sysfs. But, it
works.
Thanks!
Rusty.
---
Module autoprobing support for virtio drivers.
This adds the logic to convert the virtio ids into module aliases, and
includes a modalias entry in sysfs and the env var to make probing work.
Signed-off-by: Rusty Russell <[EMAIL PROTECTED]>
---
drivers/virtio/virtio.c | 9 +++++++++
scripts/mod/file2alias.c | 18 ++++++++++++++++++
2 files changed, 27 insertions(+)
diff -r 4b377c58d110 drivers/virtio/virtio.c
--- a/drivers/virtio/virtio.c Mon Sep 24 18:46:28 2007 +1000
+++ b/drivers/virtio/virtio.c Tue Sep 25 10:42:18 2007 +1000
@@ -19,11 +19,20 @@ static ssize_t status_show(struct device
{
struct virtio_device *dev = container_of(_d,struct virtio_device,dev);
return sprintf(buf, "0x%08x", dev->config->get_status(dev));
+}
+static ssize_t modalias_show(struct device *_d,
+ struct device_attribute *attr, char *buf)
+{
+ struct virtio_device *dev = container_of(_d,struct virtio_device,dev);
+
+ return sprintf(buf, "virtio:d%08Xv%08X\n",
+ dev->id.device, dev->id.vendor);
}
static struct device_attribute virtio_dev_attrs[] = {
__ATTR_RO(device),
__ATTR_RO(vendor),
__ATTR_RO(status),
+ __ATTR_RO(modalias),
__ATTR_NULL
};
@@ -48,6 +57,22 @@ static int virtio_dev_match(struct devic
for (i = 0; ids[i].device; i++)
if (virtio_id_match(dev, &ids[i]))
return 1;
+ return 0;
+}
+
+static int virtio_uevent(struct device *_dv, char **envp,
+ int num_envp, char *buffer, int buffer_size)
+{
+ struct virtio_device *dev = container_of(_dv,struct virtio_device,dev);
+ int i = 0, err;
+ int length = 0;
+
+ err = add_uevent_var(envp, num_envp, &i, buffer, buffer_size, &length,
+ "MODALIAS=virtio:d%08Xv%08X",
+ dev->id.device, dev->id.vendor);
+ if (err)
+ return err;
+ envp[i] = NULL;
return 0;
}
@@ -61,6 +86,7 @@ static struct virtio_bus virtio_bus = {
.name = "virtio",
.match = virtio_dev_match,
.dev_attrs = virtio_dev_attrs,
+ .uevent = virtio_uevent,
},
.dev = {
/* Can override this if you have a real bus behind it. */
diff -r 4b377c58d110 scripts/mod/file2alias.c
--- a/scripts/mod/file2alias.c Mon Sep 24 18:46:28 2007 +1000
+++ b/scripts/mod/file2alias.c Mon Sep 24 18:46:28 2007 +1000
@@ -484,6 +484,20 @@ static int do_parisc_entry(const char *f
return 1;
}
+/* Looks like: virtio:dNvN */
+static int do_virtio_entry(const char *filename, struct virtio_device_id *id,
+ char *alias)
+{
+ id->device = TO_NATIVE(id->device);
+ id->vendor = TO_NATIVE(id->vendor);
+
+ strcpy(alias, "virtio:");
+ ADD(alias, "d", 1, id->device);
+ ADD(alias, "v", id->vendor != VIRTIO_DEV_ANY_ID, id->vendor);
+
+ return 1;
+}
+
/* Ignore any prefix, eg. v850 prepends _ */
static inline int sym_is(const char *symbol, const char *name)
{
@@ -599,6 +613,10 @@ void handle_moddevtable(struct module *m
do_table(symval, sym->st_size,
sizeof(struct parisc_device_id), "parisc",
do_parisc_entry, mod);
+ else if (sym_is(symname, "__mod_virtio_device_table"))
+ do_table(symval, sym->st_size,
+ sizeof(struct virtio_device_id), "virtio",
+ do_virtio_entry, mod);
}
/* Now add out buffered information to the generated C source */
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
kvm-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/kvm-devel
