On 26/01/2024 18.25, David Woodhouse wrote:
> From: David Woodhouse <dwmw@amazon.co.uk>
>
> Obtain the MAC address from the NIC configuration if there is one, or
> generate one explicitly so that it can be placed in the PROM.
>
> Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
> ---
> hw/sparc/sun4m.c | 20 ++++++++++++++------
> 1 file changed, 14 insertions(+), 6 deletions(-)
>
> diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
> index 550af01690..e782c8ec7a 100644
> --- a/hw/sparc/sun4m.c
> +++ b/hw/sparc/sun4m.c
> @@ -299,13 +299,15 @@ static void *iommu_init(hwaddr addr, uint32_t version, qemu_irq irq)
>
> static void *sparc32_dma_init(hwaddr dma_base,
> hwaddr esp_base, qemu_irq espdma_irq,
> - hwaddr le_base, qemu_irq ledma_irq, NICInfo *nd)
> + hwaddr le_base, qemu_irq ledma_irq,
> + MACAddr *mac)
> {
> DeviceState *dma;
> ESPDMADeviceState *espdma;
> LEDMADeviceState *ledma;
> SysBusESPState *esp;
> SysBusPCNetState *lance;
> + NICInfo *nd = qemu_find_nic_info("lance", true, NULL);
>
> dma = qdev_new(TYPE_SPARC32_DMA);
> espdma = SPARC32_ESPDMA_DEVICE(object_resolve_path_component(
> @@ -320,7 +322,14 @@ static void *sparc32_dma_init(hwaddr dma_base,
>
> lance = SYSBUS_PCNET(object_resolve_path_component(
> OBJECT(ledma), "lance"));
> - qdev_set_nic_properties(DEVICE(lance), nd);
> +
> + if (nd) {
> + qdev_set_nic_properties(DEVICE(lance), nd);
> + memcpy(mac->a, nd->macaddr.a, sizeof(mac->a));
> + } else {
> + qemu_macaddr_default_if_unset(mac);
> + qdev_prop_set_macaddr(DEVICE(lance), "mac", mac->a);
> + }
>
> sysbus_realize_and_unref(SYS_BUS_DEVICE(dma), &error_fatal);
> sysbus_mmio_map(SYS_BUS_DEVICE(dma), 0, dma_base);
> @@ -823,7 +832,7 @@ static void sun4m_hw_init(MachineState *machine)
> unsigned int smp_cpus = machine->smp.cpus;
> unsigned int max_cpus = machine->smp.max_cpus;
> HostMemoryBackend *ram_memdev = machine->memdev;
> - NICInfo *nd = &nd_table[0];
> + MACAddr hostid;
>
> if (machine->ram_size > hwdef->max_mem) {
> error_report("Too much memory for this machine: %" PRId64 ","
> @@ -884,10 +893,9 @@ static void sun4m_hw_init(MachineState *machine)
> hwdef->iommu_pad_base, hwdef->iommu_pad_len);
> }
>
> - qemu_check_nic_model(nd, TYPE_LANCE);
> sparc32_dma_init(hwdef->dma_base,
> hwdef->esp_base, slavio_irq[18],
> - hwdef->le_base, slavio_irq[16], nd);
> + hwdef->le_base, slavio_irq[16], &hostid);
>
> if (graphic_depth != 8 && graphic_depth != 24) {
> error_report("Unsupported depth: %d", graphic_depth);
> @@ -1039,7 +1047,7 @@ static void sun4m_hw_init(MachineState *machine)
> machine->initrd_filename,
> machine->ram_size, &initrd_size);
>
> - nvram_init(nvram, (uint8_t *)&nd->macaddr, machine->kernel_cmdline,
> + nvram_init(nvram, hostid.a, machine->kernel_cmdline,
> machine->boot_config.order, machine->ram_size, kernel_size,
> graphic_width, graphic_height, graphic_depth,
> hwdef->nvram_machine_id, "Sun4m");
Reviewed-by: Thomas Huth <thuth@redhat.com>