On Wed, Jan 11, 2012 at 12:54 PM, Stephen Hemminger <[email protected]>wrote:
> By adding the a module alias, programs (or users) won't have to explicitly > call modprobe. Vhost-net will always be available if built into the kernel. > It does require assigning a permanent minor number for depmod to work. > Choose one next to TUN since this driver is related to it. > > Also, use C99 style initialization. > > Signed-off-by: Stephen Hemminger <[email protected]> > > --- > drivers/vhost/net.c | 8 +++++--- > include/linux/miscdevice.h | 1 + > 2 files changed, 6 insertions(+), 3 deletions(-) > > --- a/drivers/vhost/net.c 2012-01-10 10:56:58.883179194 -0800 > +++ b/drivers/vhost/net.c 2012-01-10 19:48:23.650225892 -0800 > @@ -856,9 +856,9 @@ static const struct file_operations vhos > }; > > static struct miscdevice vhost_net_misc = { > - MISC_DYNAMIC_MINOR, > - "vhost-net", > - &vhost_net_fops, > + .minor = VHOST_NET_MINOR, > + .name = "vhost-net", > + .fops = &vhost_net_fops, > }; > > static int vhost_net_init(void) > @@ -879,3 +879,5 @@ MODULE_VERSION("0.0.1"); > MODULE_LICENSE("GPL v2"); > MODULE_AUTHOR("Michael S. Tsirkin"); > MODULE_DESCRIPTION("Host kernel accelerator for virtio net"); > +MODULE_ALIAS_MISCDEV(VHOST_NET_MINOR); > +MODULE_ALIAS("devname:vhost-net"); > --- a/include/linux/miscdevice.h 2012-01-10 10:56:59.779189436 > -0800 > +++ b/include/linux/miscdevice.h 2012-01-10 19:49:56.091748210 > -0800 > @@ -31,6 +31,7 @@ > #define I2O_MINOR 166 > #define MICROCODE_MINOR 184 > #define TUN_MINOR 200 > +#define VHOST_NET_MINOR 201 > CC: [email protected] CC: [email protected] include/linux/miscdevice.h: /* * These allocations are managed by [email protected]. If you use an * entry that is not in assigned your entry may well be moved and * reassigned, or set dynamic if a fixed value is not justified. */ #define MWAVE_MINOR 219 /* ACP/Mwave Modem */ > #define MPT_MINOR 220 > #define MPT2SAS_MINOR 221 > > _______________________________________________ > Virtualization mailing list > [email protected] > https://lists.linuxfoundation.org/mailman/listinfo/virtualization >
_______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
