From: Michael S. Tsirkin <mst@redhat.com>
Date: Tue, 14 Jun 2011 14:15:34 +0000 (+0300)
Subject: usb-ehci: move device/vendor/class id to qdev
X-Git-Tag: v0.15.0-rc0~154^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9047c0b40654ce3578c148f6754f878218569252;p=thirdparty%2Fqemu.git

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

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---

diff --git a/hw/usb-ehci.c b/hw/usb-ehci.c
index f63519ecf94..4d6989a7044 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);