[xen] Accept alternative Xen platform PCI device ID 5853:0002

At some point during XenServer development history, the Windows PV
drivers changed to using a PCI device ID of 5853:0002 rather than
5853:0001.  Current (7.2.0) drivers will bind to either 5853:0001 or
5853:0002, and the general approach taken by the world at large
(including Amazon EC2) seems to be to use only 5853:0001.

However, the current version of XenServer (6.2.0) will create the
platform device as 5853:0002 (via the platform:device_id VM parameter)
for any VMs created using the built-in templates for Windows Vista or
later.

Accept either PCI ID, since the underlying device is identical.

Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/arch/x86/drivers/xen/hvm.c b/src/arch/x86/drivers/xen/hvm.c
index 28411cd8c7ee019f2a309317f699c92ae0c044ee..c2eafdadb4b37f315c6287115e0a8d0388cb4b36 100644 (file)
--- a/src/arch/x86/drivers/xen/hvm.c
+++ b/src/arch/x86/drivers/xen/hvm.c
@@ -510,6 +510,7 @@ static void hvm_remove ( struct pci_device *pci ) {
 /** PCI device IDs */
 static struct pci_device_id hvm_ids[] = {
        PCI_ROM ( 0x5853, 0x0001, "hvm", "hvm", 0 ),
+       PCI_ROM ( 0x5853, 0x0002, "hvm2", "hvm2", 0 ),
 };
 
 /** PCI driver */