Re: [PATCH 4/6] hw/isa/piix{3, 4}: Factor out ISABus retrieval from create() functions

[Mark Cave-Ayland]

On 13/05/2022 18:54, Bernhard Beschow wrote:

> Modernizes the code and even saves a few lines.
>
> Signed-off-by: Bernhard Beschow <shentey@gmail.com>
> ---
>   hw/i386/pc_piix.c             | 3 ++-
>   hw/isa/piix3.c                | 3 +--
>   hw/isa/piix4.c                | 6 +-----
>   hw/mips/malta.c               | 3 ++-
>   include/hw/southbridge/piix.h | 4 ++--
>   5 files changed, 8 insertions(+), 11 deletions(-)
>
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index f843dd906f..47932448fd 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -206,9 +206,10 @@ static void pc_init1(MachineState *machine,
>                                 pci_memory, ram_memory);
>           pcms->bus = pci_bus;
>   
> -        piix3 = piix3_create(pci_bus, &isa_bus);
> +        piix3 = piix3_create(pci_bus);
>           piix3->pic = x86ms->gsi;
>           piix3_devfn = piix3->dev.devfn;
> +        isa_bus = ISA_BUS(qdev_get_child_bus(DEVICE(piix3), "isa.0"));
>       } else {
>           pci_bus = NULL;
>           i440fx_state = NULL;
> diff --git a/hw/isa/piix3.c b/hw/isa/piix3.c
> index d15117a7c7..6eacb22dd0 100644
> --- a/hw/isa/piix3.c
> +++ b/hw/isa/piix3.c
> @@ -403,7 +403,7 @@ static void piix3_register_types(void)
>   
>   type_init(piix3_register_types)
>   
> -PIIX3State *piix3_create(PCIBus *pci_bus, ISABus **isa_bus)
> +PIIX3State *piix3_create(PCIBus *pci_bus)
>   {
>       PIIX3State *piix3;
>       PCIDevice *pci_dev;
> @@ -412,7 +412,6 @@ PIIX3State *piix3_create(PCIBus *pci_bus, ISABus **isa_bus)
>   
>       pci_dev = pci_create_simple_multifunction(pci_bus, -1, true, type);
>       piix3 = PIIX3_PCI_DEVICE(pci_dev);
> -    *isa_bus = ISA_BUS(qdev_get_child_bus(DEVICE(piix3), "isa.0"));
>   
>       return piix3;
>   }
> diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
> index 134d23aea7..4968c69da9 100644
> --- a/hw/isa/piix4.c
> +++ b/hw/isa/piix4.c
> @@ -301,7 +301,7 @@ static void piix4_register_types(void)
>   
>   type_init(piix4_register_types)
>   
> -DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus, I2CBus **smbus)
> +DeviceState *piix4_create(PCIBus *pci_bus, I2CBus **smbus)
>   {
>       PCIDevice *pci;
>       DeviceState *dev;
> @@ -311,10 +311,6 @@ DeviceState *piix4_create(PCIBus *pci_bus, ISABus 
> **isa_bus, I2CBus **smbus)
>                                             TYPE_PIIX4_PCI_DEVICE);
>       dev = DEVICE(pci);
>   
> -    if (isa_bus) {
> -        *isa_bus = ISA_BUS(qdev_get_child_bus(dev, "isa.0"));
> -    }
> -
>       if (smbus) {
>           *smbus = piix4_pm_init(pci_bus, devfn + 3, 0x1100,
>                                  qdev_get_gpio_in_named(dev, "isa", 9),
> diff --git a/hw/mips/malta.c b/hw/mips/malta.c
> index 9ffdc5b8f1..e446b25ad0 100644
> --- a/hw/mips/malta.c
> +++ b/hw/mips/malta.c
> @@ -1399,7 +1399,8 @@ void mips_malta_init(MachineState *machine)
>       empty_slot_init("GT64120", 0, 0x20000000);
>   
>       /* Southbridge */
> -    dev = piix4_create(pci_bus, &isa_bus, &smbus);
> +    dev = piix4_create(pci_bus, &smbus);
> +    isa_bus = ISA_BUS(qdev_get_child_bus(dev, "isa.0"));
>   
>       /* Interrupt controller */
>       qdev_connect_gpio_out_named(dev, "intr", 0, i8259_irq);
> diff --git a/include/hw/southbridge/piix.h b/include/hw/southbridge/piix.h
> index a304fc6041..b768109f30 100644
> --- a/include/hw/southbridge/piix.h
> +++ b/include/hw/southbridge/piix.h
> @@ -72,8 +72,8 @@ DECLARE_INSTANCE_CHECKER(PIIX3State, PIIX3_PCI_DEVICE,
>   
>   #define TYPE_PIIX4_PCI_DEVICE "piix4-isa"
>   
> -PIIX3State *piix3_create(PCIBus *pci_bus, ISABus **isa_bus);
> +PIIX3State *piix3_create(PCIBus *pci_bus);
>   
> -DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus, I2CBus **smbus);
> +DeviceState *piix4_create(PCIBus *pci_bus, I2CBus **smbus);
>   
>   #endif

Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


ATB,

Mark.