From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:47700) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QN2Av-0005Jd-V1 for qemu-devel@nongnu.org; Thu, 19 May 2011 08:17:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QN2Au-0001CK-Ps for qemu-devel@nongnu.org; Thu, 19 May 2011 08:17:57 -0400 Received: from mail.valinux.co.jp ([210.128.90.3]:39478) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QN2Au-0001Bu-8I for qemu-devel@nongnu.org; Thu, 19 May 2011 08:17:56 -0400 Date: Thu, 19 May 2011 21:17:53 +0900 From: Isaku Yamahata Message-ID: <20110519121753.GC28673@valinux.co.jp> References: <769ccda905c18b6bed03de5356dcb5d3e99d0f4e.1305650874.git.yamahata@valinux.co.jp> <20110519115513.GB28673@valinux.co.jp> <20110519115941.GA4266@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20110519115941.GA4266@redhat.com> Subject: Re: [Qemu-devel] [PATCH v2 09/38] hw/acpi_piix4.c: convert to PCIDeviceInfo to initialize ids List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Michael S. Tsirkin" Cc: Markus Armbruster , qemu-devel@nongnu.org On Thu, May 19, 2011 at 02:59:42PM +0300, Michael S. Tsirkin wrote: > no reason to respin the whole patchset, just this patch. Here is the update patch. >>From c3629ffd472018505a6818422b310ce96aedbc42 Mon Sep 17 00:00:00 2001 Message-Id: In-Reply-To: References: From: Isaku Yamahata Date: Wed, 18 May 2011 01:26:45 +0900 Subject: [PATCH 09/42] hw/acpi_piix4.c: convert to PCIDeviceInfo to initialize ids use PCIDeviceInfo to initialize ids. Signed-off-by: Isaku Yamahata --- hw/acpi_piix4.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c index 96f5222..232008d 100644 --- a/hw/acpi_piix4.c +++ b/hw/acpi_piix4.c @@ -317,13 +317,9 @@ static int piix4_pm_initfn(PCIDevice *dev) uint8_t *pci_conf; pci_conf = s->dev.config; - pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_INTEL); - pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_INTEL_82371AB_3); pci_conf[0x06] = 0x80; pci_conf[0x07] = 0x02; - pci_conf[0x08] = 0x03; // revision number pci_conf[0x09] = 0x00; - pci_config_set_class(pci_conf, PCI_CLASS_BRIDGE_OTHER); pci_conf[0x3d] = 0x01; // interrupt pin 1 pci_conf[0x40] = 0x01; /* PM io base read only bit */ @@ -394,6 +390,10 @@ static PCIDeviceInfo piix4_pm_info = { .no_hotplug = 1, .init = piix4_pm_initfn, .config_write = pm_write_config, + .vendor_id = PCI_VENDOR_ID_INTEL, + .device_id = PCI_DEVICE_ID_INTEL_82371AB_3, + .revision = 0x03, + .class_id = PCI_CLASS_BRIDGE_OTHER, .qdev.props = (Property[]) { DEFINE_PROP_UINT32("smb_io_base", PIIX4PMState, smb_io_base, 0), DEFINE_PROP_END_OF_LIST(), -- 1.7.1.1 -- yamahata