Re: [PATCH v3 17/46] hw/ppc: use pci_init_nic_devices()

[Thomas Huth]

On 08/01/2024 21.26, David Woodhouse wrote:
> From: David Woodhouse <dwmw@amazon.co.uk>
>
> Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
> ---
>   hw/ppc/e500.c          |  4 +---
>   hw/ppc/mac_newworld.c  |  4 +---
>   hw/ppc/mac_oldworld.c  |  4 +---
>   hw/ppc/ppc440_bamboo.c | 14 +++++---------
>   4 files changed, 8 insertions(+), 18 deletions(-)
>
> diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
> index 566f1200dd..3bd12b54ab 100644
> --- a/hw/ppc/e500.c
> +++ b/hw/ppc/e500.c
> @@ -1079,9 +1079,7 @@ void ppce500_init(MachineState *machine)
>   
>       if (pci_bus) {
>           /* Register network interfaces. */
> -        for (i = 0; i < nb_nics; i++) {
> -            pci_nic_init_nofail(&nd_table[i], pci_bus, mc->default_nic, NULL);
> -        }
> +        pci_init_nic_devices(pci_bus, mc->default_nic);
>       }
>   
>       /* Register spinning region */
> diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
> index 535710314a..b36dbaf2b6 100644
> --- a/hw/ppc/mac_newworld.c
> +++ b/hw/ppc/mac_newworld.c
> @@ -444,9 +444,7 @@ static void ppc_core99_init(MachineState *machine)
>           graphic_depth = 15;
>       }
>   
> -    for (i = 0; i < nb_nics; i++) {
> -        pci_nic_init_nofail(&nd_table[i], pci_bus, mc->default_nic, NULL);
> -    }
> +    pci_init_nic_devices(pci_bus, mc->default_nic);
>   
>       /* The NewWorld NVRAM is not located in the MacIO device */
>       if (kvm_enabled() && qemu_real_host_page_size() > 4096) {
> diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
> index 9acc7adfc9..1981d3d8f6 100644
> --- a/hw/ppc/mac_oldworld.c
> +++ b/hw/ppc/mac_oldworld.c
> @@ -277,9 +277,7 @@ static void ppc_heathrow_init(MachineState *machine)
>   
>       pci_vga_init(pci_bus);
>   
> -    for (i = 0; i < nb_nics; i++) {
> -        pci_nic_init_nofail(&nd_table[i], pci_bus, mc->default_nic, NULL);
> -    }
> +    pci_init_nic_devices(pci_bus, mc->default_nic);
>   
>       /* MacIO IDE */
>       ide_drive_get(hd, ARRAY_SIZE(hd));
> diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c
> index a189942de4..c75c3083e6 100644
> --- a/hw/ppc/ppc440_bamboo.c
> +++ b/hw/ppc/ppc440_bamboo.c
> @@ -161,7 +161,6 @@ static void bamboo_init(MachineState *machine)
>       DeviceState *uicdev;
>       SysBusDevice *uicsbd;
>       int success;
> -    int i;
>   
>       if (kvm_enabled()) {
>           error_report("machine %s does not support the KVM accelerator",
> @@ -234,14 +233,11 @@ static void bamboo_init(MachineState *machine)
>       }
>   
>       if (pcibus) {
> -        /* Register network interfaces. */
> -        for (i = 0; i < nb_nics; i++) {
> -            /*
> -             * There are no PCI NICs on the Bamboo board, but there are
> -             * PCI slots, so we can pick whatever default model we want.
> -             */
> -            pci_nic_init_nofail(&nd_table[i], pcibus, mc->default_nic, NULL);
> -        }
> +        /*
> +         * There are no PCI NICs on the Bamboo board, but there are
> +         * PCI slots, so we can pick whatever default model we want.
> +         */
> +        pci_init_nic_devices(pcibus, mc->default_nic);
>       }
>   
>       /* Load kernel. */

Reviewed-by: Thomas Huth <thuth@redhat.com>