aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2010-02-25 19:42:10 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-03-15 12:06:03 -0400
commit896d0d640ce75542d0697b4b25c2b1d85c859967 (patch)
treee24e1d695c4c6cb518c5823c5f7e02ae86e9f861
parentca3ee1cb47774f5575750883335817a2102d73c9 (diff)
Staging: hv: add a pci device table
commit 9a775dbd4e8c87b7d35549183145321c7205404e upstream. This allows the HV core to be properly found and autoloaded by the system tools. It uses the Microsoft virtual VGA device to trigger this. Cc: Haiyang Zhang <haiyangz@microsoft.com> Cc: Hank Janssen <hjanssen@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/hv/vmbus_drv.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c
index 894eecfc63ca..090b32d5d37a 100644
--- a/drivers/staging/hv/vmbus_drv.c
+++ b/drivers/staging/hv/vmbus_drv.c
@@ -24,6 +24,7 @@
24#include <linux/irq.h> 24#include <linux/irq.h>
25#include <linux/interrupt.h> 25#include <linux/interrupt.h>
26#include <linux/sysctl.h> 26#include <linux/sysctl.h>
27#include <linux/pci.h>
27#include "osd.h" 28#include "osd.h"
28#include "logging.h" 29#include "logging.h"
29#include "vmbus.h" 30#include "vmbus.h"
@@ -973,6 +974,22 @@ static void __exit vmbus_exit(void)
973 return; 974 return;
974} 975}
975 976
977/*
978 * We use a PCI table to determine if we should autoload this driver This is
979 * needed by distro tools to determine if the hyperv drivers should be
980 * installed and/or configured. We don't do anything else with the table, but
981 * it needs to be present.
982 *
983 * We might consider triggering off of DMI table info as well, as that does
984 * decribe the virtual machine being run on, but not all configuration tools
985 * seem to be able to handle DMI device ids properly.
986 */
987const static struct pci_device_id microsoft_hv_pci_table[] = {
988 { PCI_DEVICE(0x1414, 0x5353) }, /* VGA compatible controller */
989 { 0 }
990};
991MODULE_DEVICE_TABLE(pci, microsoft_hv_pci_table);
992
976MODULE_LICENSE("GPL"); 993MODULE_LICENSE("GPL");
977module_param(vmbus_irq, int, S_IRUGO); 994module_param(vmbus_irq, int, S_IRUGO);
978module_param(vmbus_loglevel, int, S_IRUGO); 995module_param(vmbus_loglevel, int, S_IRUGO);