* [Qemu-devel] [PATCH] pci_ids: tweak names to match linux/pci_ids.h
@ 2011-06-26 13:19 Michael S. Tsirkin
2011-06-27 12:21 ` Stefano Stabellini
0 siblings, 1 reply; 4+ messages in thread
From: Michael S. Tsirkin @ 2011-06-26 13:19 UTC (permalink / raw)
To: qemu-devel
Cc: Anthony PERARD, Steven Smith, Alexander Graf, Stefano Stabellini
Sync xen names to ones used by linux. Add
xen platform device id as well.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [PATCH] pci_ids: tweak names to match linux/pci_ids.h
2011-06-26 13:19 [Qemu-devel] [PATCH] pci_ids: tweak names to match linux/pci_ids.h Michael S. Tsirkin
@ 2011-06-27 12:21 ` Stefano Stabellini
2011-06-29 11:05 ` Alexander Graf
0 siblings, 1 reply; 4+ messages in thread
From: Stefano Stabellini @ 2011-06-27 12:21 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: Steven Smith, Alexander Graf, Anthony Perard,
qemu-devel@nongnu.org, 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 <mst@redhat.com>
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
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] pci_ids: tweak names to match linux/pci_ids.h
2011-06-27 12:21 ` Stefano Stabellini
@ 2011-06-29 11:05 ` Alexander Graf
2011-06-29 12:51 ` Michael S. Tsirkin
0 siblings, 1 reply; 4+ messages in thread
From: Alexander Graf @ 2011-06-29 11:05 UTC (permalink / raw)
To: Stefano Stabellini
Cc: Steven Smith, Anthony Perard, qemu-devel@nongnu.org,
Michael S. Tsirkin
On 27.06.2011, at 14:21, Stefano Stabellini wrote:
> 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 <mst@redhat.com>
>
> thanks for the patch, it is fine by me.
Michael, which tree do you want this to go through?
Alex
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] pci_ids: tweak names to match linux/pci_ids.h
2011-06-29 11:05 ` Alexander Graf
@ 2011-06-29 12:51 ` Michael S. Tsirkin
0 siblings, 0 replies; 4+ messages in thread
From: Michael S. Tsirkin @ 2011-06-29 12:51 UTC (permalink / raw)
To: Alexander Graf
Cc: Steven Smith, Anthony Perard, qemu-devel@nongnu.org,
Stefano Stabellini
On Wed, Jun 29, 2011 at 01:05:37PM +0200, Alexander Graf wrote:
>
> On 27.06.2011, at 14:21, Stefano Stabellini wrote:
>
> > 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 <mst@redhat.com>
> >
> > thanks for the patch, it is fine by me.
>
> Michael, which tree do you want this to go through?
>
>
> Alex
I put this on my tree.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-06-29 12:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-26 13:19 [Qemu-devel] [PATCH] pci_ids: tweak names to match linux/pci_ids.h Michael S. Tsirkin
2011-06-27 12:21 ` Stefano Stabellini
2011-06-29 11:05 ` Alexander Graf
2011-06-29 12:51 ` Michael S. Tsirkin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).