From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:38493) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QWXWr-00041h-W8 for qemu-devel@nongnu.org; Tue, 14 Jun 2011 13:35:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QWXWp-00061N-Pl for qemu-devel@nongnu.org; Tue, 14 Jun 2011 13:35:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53693) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QWXWp-000610-95 for qemu-devel@nongnu.org; Tue, 14 Jun 2011 13:35:51 -0400 Date: Tue, 14 Jun 2011 20:35:28 +0300 From: "Michael S. Tsirkin" Message-ID: <3f364eeef711d9150d3f6d55696c55d2a6dab4cd.1308072799.git.mst@redhat.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Subject: [Qemu-devel] [PATCH 02/10] usb-ehci: move device/vendor/class id to qdev List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Alexander Graf , Anthony Liguori , Marcelo Tosatti , Gerd Hoffmann , Stefan Hajnoczi , kvm@vger.kernel.org, "Michael S. Tsirkin" , Jan Kiszka , Riku Voipio , Christoph Hellwig , Blue Swirl , Alex Williamson , Isaku Yamahata , Paul Brook , Paolo Bonzini , Avi Kivity , Aurelien Jarno , Richard Henderson Signed-off-by: Michael S. Tsirkin --- hw/usb-ehci.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) 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); -- 1.7.5.53.gc233e