Re: [Qemu-devel] [PATCH v2 09/38] hw/acpi_piix4.c: convert to PCIDeviceInfo to initialize ids

[Michael S. Tsirkin]

On Thu, May 19, 2011 at 08:55:13PM +0900, Isaku Yamahata wrote:
> On Thu, May 19, 2011 at 10:10:09AM +0200, Markus Armbruster wrote:
> > Isaku Yamahata <address@hidden> writes:
> > 
> > > use PCIDeviceInfo to initialize ids.
> > >
> > > Signed-off-by: Isaku Yamahata <address@hidden>
> > > ---
> > >  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..03d833a 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, // revision number
> > 
> > The comment is now redundant.  Drop it?
> 
> Okay, will do.

no reason to respin the whole patchset, just this patch.

> > 
> > > +    .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(),
> > 
> 
> -- 
> yamahata