Re: [Qemu-devel] [PATCH] pci_ids: tweak names to match linux/pci_ids.h

[Stefano Stabellini]

On Sun, 26 Jun 2011, Michael S. Tsirkin wrote:
> Sync xen names to ones used by linux. Add
> xen platform device id as well.
> 
> Signed-off-by: Michael S. Tsirkin <address@hidden>

thanks for the patch, it is fine by me.


> ---
>  hw/pci_ids.h      |    3 ++-
>  hw/xen_platform.c |    8 ++++----
>  2 files changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/hw/pci_ids.h b/hw/pci_ids.h
> index d94578c..b49c602 100644
> --- a/hw/pci_ids.h
> +++ b/hw/pci_ids.h
> @@ -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
> diff --git a/hw/xen_platform.c b/hw/xen_platform.c
> index b167eee..9a01735 100644
> --- a/hw/xen_platform.c
> +++ b/hw/xen_platform.c
> @@ -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);
>  
> -- 
> 1.7.5.53.gc233e
>