Patchwork usb-ehci: move device/vendor/class id to qdev

login
register
mail settings
Submitter Michael S. Tsirkin
Date June 14, 2011, 5:40 p.m.
Message ID <20110614174020.GA13285@redhat.com>
Download mbox | patch
Permalink /patch/100397/
State New
Headers show

Comments

Michael S. Tsirkin - June 14, 2011, 5:40 p.m.
This is on top of my pci tree.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 hw/usb-ehci.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)
Gerd Hoffmann - June 15, 2011, 6:32 a.m.
On 06/14/11 19:40, Michael S. Tsirkin wrote:
> This is on top of my pci tree.

Looks good.  Wanna queue this up in your PCI tree, so all devices are 
switched over at once when this is merged?

cheers,
   Gerd
Michael S. Tsirkin - June 15, 2011, 6:48 a.m.
On Wed, Jun 15, 2011 at 08:32:50AM +0200, Gerd Hoffmann wrote:
> On 06/14/11 19:40, Michael S. Tsirkin wrote:
> >This is on top of my pci tree.
> 
> Looks good.  Wanna queue this up in your PCI tree, so all devices
> are switched over at once when this is merged?
> 
> cheers,
>   Gerd

Guess so, yes.
Thanks for the review.

Patch

diff --git a/hw/usb-ehci.c b/hw/usb-ehci.c
index f63519e..4d6989a 100644
--- a/hw/usb-ehci.c
+++ b/hw/usb-ehci.c
@@ -1945,6 +1945,10 @@  static PCIDeviceInfo ehci_info = {
     .qdev.name    = "usb-ehci",
     .qdev.size    = sizeof(EHCIState),
     .init         = usb_ehci_initfn,
+    .vendor_id    = PCI_VENDOR_ID_INTEL,
+    .device_id    = PCI_DEVICE_ID_INTEL_82801D,
+    .revision     = 0x10,
+    .class_id     = PCI_CLASS_SERIAL_USB,
 };
 
 static int usb_ehci_initfn(PCIDevice *dev)
@@ -1953,12 +1957,7 @@  static int usb_ehci_initfn(PCIDevice *dev)
     uint8_t *pci_conf = s->dev.config;
     int i;
 
-    pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_INTEL);
-    pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_INTEL_82801D);
-    pci_set_byte(&pci_conf[PCI_REVISION_ID], 0x10);
     pci_set_byte(&pci_conf[PCI_CLASS_PROG], 0x20);
-    pci_config_set_class(pci_conf, PCI_CLASS_SERIAL_USB);
-    pci_set_byte(&pci_conf[PCI_HEADER_TYPE], PCI_HEADER_TYPE_NORMAL);
 
     /* capabilities pointer */
     pci_set_byte(&pci_conf[PCI_CAPABILITY_LIST], 0x00);