ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/mips/jazz: use qemu_find_nic_info() 

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:49 +01:00
parent b07734f971
commit e104edbb9d
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/mips/jazz.c
View File

@ -119,15 +119,19 @@ static const MemoryRegionOps dma_dummy_ops = {
.endianness = DEVICE_NATIVE_ENDIAN, .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 *rc4030, MemoryRegion *dp8393x_prom)
{ {
DeviceState *dev; DeviceState *dev;
SysBusDevice *sysbus; SysBusDevice *sysbus;
int checksum, i; int checksum, i;
uint8_t *prom; 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"); dev = qdev_new("dp8393x");
qdev_set_nic_properties(dev, nd); qdev_set_nic_properties(dev, nd);
@ -324,12 +328,7 @@ static void mips_jazz_init(MachineState *machine,
} }
/* Network controller */ /* Network controller */
if (nb_nics == 1) { mips_jazz_init_net(rc4030_dma_mr, rc4030, dp8393x_prom);
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);
}
/* SCSI adapter */ /* SCSI adapter */
dev = qdev_new(TYPE_SYSBUS_ESP); dev = qdev_new(TYPE_SYSBUS_ESP);