pci_ids: tweak names to match linux/pci_ids.h

Sync xen names to ones used by linux. Add
xen platform device id as well.

Signed-off-by Michael S. Tsirkin <[email protected]>

---
 hw/pci_ids.h      |    3 ++-
 hw/xen_platform.c |    8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

hw/pci_ids.h +2 -1

index d94578c..b49c602 100644
@@ -110,4 +110,5 @@
 #define PCI_DEVICE_ID_INTEL_82371AB_2    0x7112
 #define PCI_DEVICE_ID_INTEL_82371AB_3    0x7113
 
-#define PCI_VENDOR_ID_XENSOURCE          0x5853
+#define PCI_VENDOR_ID_XEN               0x5853
+#define PCI_DEVICE_ID_XEN_PLATFORM      0x0001

hw/xen_platform.c +4 -4

index b167eee..9a01735 100644
@@ -290,10 +290,10 @@ static int xen_platform_initfn(PCIDevice *dev)
 
     pci_conf = d->pci_dev.config;
 
-    pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_XENSOURCE);
-    pci_config_set_device_id(pci_conf, 0x0001);
-    pci_set_word(pci_conf + PCI_SUBSYSTEM_VENDOR_ID, PCI_VENDOR_ID_XENSOURCE);
-    pci_set_word(pci_conf + PCI_SUBSYSTEM_ID, 0x0001);
+    pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_XEN);
+    pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_XEN_PLATFORM);
+    pci_set_word(pci_conf + PCI_SUBSYSTEM_VENDOR_ID, PCI_VENDOR_ID_XEN);
+    pci_set_word(pci_conf + PCI_SUBSYSTEM_ID, PCI_DEVICE_ID_XEN_PLATFORM);
 
     pci_set_word(pci_conf + PCI_COMMAND, PCI_COMMAND_IO | PCI_COMMAND_MEMORY);
 

Signature · 1 line

1.7.5.53.gc233e

Quoted 4 lines · Michael S. Tsirkin

Sync xen names to ones used by linux. Add
xen platform device id as well.

Signed-off-by Michael S. Tsirkin <[email protected]>

thanks for the patch, it is fine by me.

Quoted 4 lines · Stefano Stabellini

Quoted 3 lines · Michael S. Tsirkin

Sync xen names to ones used by linux. Add
xen platform device id as well.

Quoted 3 lines

Quoted 1 line

Signed-off-by Michael S. Tsirkin <[email protected]>

thanks for the patch, it is fine by me.

Michael, which tree do you want this to go through?

Alex