OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

hw/sparc/sun4m: use qemu_find_nic_info()

Browse Source 
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>
Reviewed-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
David Woodhouse 2023-10-23 09:37:55 +01:00
parent 646f87a874
commit ae0b175b23
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/sparc/sun4m.c
View File

@ -299,13 +299,15 @@ static void *iommu_init(hwaddr addr, uint32_t version, qemu_irq irq)
static void *sparc32_dma_init(hwaddr dma_base, static void *sparc32_dma_init(hwaddr dma_base,
hwaddr esp_base, qemu_irq espdma_irq, 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; DeviceState *dma;
ESPDMADeviceState *espdma; ESPDMADeviceState *espdma;
LEDMADeviceState *ledma; LEDMADeviceState *ledma;
SysBusESPState *esp; SysBusESPState *esp;
SysBusPCNetState *lance; SysBusPCNetState *lance;
NICInfo *nd = qemu_find_nic_info("lance", true, NULL);
dma = qdev_new(TYPE_SPARC32_DMA); dma = qdev_new(TYPE_SPARC32_DMA);
espdma = SPARC32_ESPDMA_DEVICE(object_resolve_path_component( 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( lance = SYSBUS_PCNET(object_resolve_path_component(
OBJECT(ledma), "lance")); 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_realize_and_unref(SYS_BUS_DEVICE(dma), &error_fatal);
sysbus_mmio_map(SYS_BUS_DEVICE(dma), 0, dma_base); 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 smp_cpus = machine->smp.cpus;
unsigned int max_cpus = machine->smp.max_cpus; unsigned int max_cpus = machine->smp.max_cpus;
HostMemoryBackend *ram_memdev = machine->memdev; HostMemoryBackend *ram_memdev = machine->memdev;
NICInfo *nd = &nd_table[0]; MACAddr hostid;
if (machine->ram_size > hwdef->max_mem) { if (machine->ram_size > hwdef->max_mem) {
error_report("Too much memory for this machine: %" PRId64 "," 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); hwdef->iommu_pad_base, hwdef->iommu_pad_len);
} }
qemu_check_nic_model(nd, TYPE_LANCE);
sparc32_dma_init(hwdef->dma_base, sparc32_dma_init(hwdef->dma_base,
hwdef->esp_base, slavio_irq[18], 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) { if (graphic_depth != 8 && graphic_depth != 24) {
error_report("Unsupported depth: %d", graphic_depth); error_report("Unsupported depth: %d", graphic_depth);
@ -1039,7 +1047,7 @@ static void sun4m_hw_init(MachineState *machine)
machine->initrd_filename, machine->initrd_filename,
machine->ram_size, &initrd_size); 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, machine->boot_config.order, machine->ram_size, kernel_size,
graphic_width, graphic_height, graphic_depth, graphic_width, graphic_height, graphic_depth,
hwdef->nvram_machine_id, "Sun4m"); hwdef->nvram_machine_id, "Sun4m");