[Qemu-devel] Re: [PATCH v4 4/6] pci: don't overwrite multi functio bit in pci header type.

[Michael S. Tsirkin]

On Mon, Jun 21, 2010 at 03:03:59PM +0900, Isaku Yamahata wrote:
> diff --git a/hw/piix4.c b/hw/piix4.c
> index f75951b..03926a7 100644
> --- a/hw/piix4.c
> +++ b/hw/piix4.c
> @@ -93,8 +93,7 @@ static int piix4_initfn(PCIDevice *d)
>      pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_INTEL);
>      pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_INTEL_82371AB_0); // 
> 82371AB/EB/MB PIIX4 PCI-to-ISA bridge
>      pci_config_set_class(pci_conf, PCI_CLASS_BRIDGE_ISA);
> -    pci_conf[PCI_HEADER_TYPE] =
> -        PCI_HEADER_TYPE_NORMAL | PCI_HEADER_TYPE_MULTI_FUNCTION; // 
> header_type = PCI_multifunction, generic
> +    pci_conf[PCI_HEADER_TYPE] |= PCI_HEADER_TYPE_MULTI_FUNCTION;
>  

IMO it's cleaner not to change the same line twice.
Just move this bit to the next patch.

>      piix4_dev = d;
>      qemu_register_reset(piix4_reset, d);
> diff --git a/hw/piix_pci.c b/hw/piix_pci.c
> index 16645cd..0b0c92b 100644
> --- a/hw/piix_pci.c
> +++ b/hw/piix_pci.c
> @@ -208,7 +208,6 @@ static int i440fx_initfn(PCIDevice *dev)
>      pci_config_set_device_id(d->dev.config, PCI_DEVICE_ID_INTEL_82441);
>      d->dev.config[0x08] = 0x02; // revision
>      pci_config_set_class(d->dev.config, PCI_CLASS_BRIDGE_HOST);
> -    d->dev.config[PCI_HEADER_TYPE] = PCI_HEADER_TYPE_NORMAL; // header_type
>  
>      d->dev.config[I440FX_SMRAM] = 0x02;
>  
> @@ -337,8 +336,7 @@ static int piix3_initfn(PCIDevice *dev)
>      pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_INTEL);
>      pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_INTEL_82371SB_0); // 
> 82371SB PIIX3 PCI-to-ISA bridge (Step A1)
>      pci_config_set_class(pci_conf, PCI_CLASS_BRIDGE_ISA);
> -    pci_conf[PCI_HEADER_TYPE] =
> -        PCI_HEADER_TYPE_NORMAL | PCI_HEADER_TYPE_MULTI_FUNCTION; // 
> header_type = PCI_multifunction, generic
> +    pci_conf[PCI_HEADER_TYPE] |= PCI_HEADER_TYPE_MULTI_FUNCTION;
>  


same here