Re: [PATCH v3 36/46] hw/mips/jazz: use qemu_find_nic_info()

[Thomas Huth]

On 08/01/2024 21.27, David Woodhouse wrote:
> From: David Woodhouse <dwmw@amazon.co.uk>
>
> Extract the MAC address from the NICInfo, or generate one explicitly if
> there was no corresponding NIC configuration, to put it in the PROM.

Uh, I don't see any MAC handling in the patch below? Is this the right 
comment for this patch?

 Thomas


> Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
> ---
>   hw/mips/jazz.c | 15 +++++++--------
>   1 file changed, 7 insertions(+), 8 deletions(-)
>
> diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c
> index 0d2348aa5a..5bf3e328db 100644
> --- a/hw/mips/jazz.c
> +++ b/hw/mips/jazz.c
> @@ -119,15 +119,19 @@ static const MemoryRegionOps dma_dummy_ops = {
>       .endianness = DEVICE_NATIVE_ENDIAN,
>   };
>   
> -static void mips_jazz_init_net(NICInfo *nd, IOMMUMemoryRegion *rc4030_dma_mr,
> +static void mips_jazz_init_net(IOMMUMemoryRegion *rc4030_dma_mr,
>                                  DeviceState *rc4030, MemoryRegion 
> *dp8393x_prom)
>   {
>       DeviceState *dev;
>       SysBusDevice *sysbus;
>       int checksum, i;
>       uint8_t *prom;
> +    NICInfo *nd;
>   
> -    qemu_check_nic_model(nd, "dp83932");
> +    nd = qemu_find_nic_info("dp8393x", true, "dp82932");
> +    if (!nd) {
> +        return;
> +    }
>   
>       dev = qdev_new("dp8393x");
>       qdev_set_nic_properties(dev, nd);
> @@ -324,12 +328,7 @@ static void mips_jazz_init(MachineState *machine,
>       }
>   
>       /* Network controller */
> -    if (nb_nics == 1) {
> -        mips_jazz_init_net(&nd_table[0], rc4030_dma_mr, rc4030, dp8393x_prom);
> -    } else if (nb_nics > 1) {
> -        error_report("This machine only supports one NIC");
> -        exit(1);
> -    }
> +    mips_jazz_init_net(rc4030_dma_mr, rc4030, dp8393x_prom);
>   
>       /* SCSI adapter */
>       dev = qdev_new(TYPE_SYSBUS_ESP);