diff options
| author | David Woodhouse <dwmw@amazon.co.uk> | 2023-10-23 09:37:49 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw@amazon.co.uk> | 2024-02-02 16:23:47 +0000 |
| commit | e104edbb9d0fd53e3a432cbb3b6b5fb2cb81a962 (patch) | |
| tree | e3614ecc0924a74e6555dfe59ab9f8e008bd0185 /hw/mips/jazz.c | |
| parent | b07734f97121e4db1564fa3b39c36946cbdb0de4 (diff) | |
| download | qemu-e104edbb9d0fd53e3a432cbb3b6b5fb2cb81a962.zip qemu-e104edbb9d0fd53e3a432cbb3b6b5fb2cb81a962.tar.gz qemu-e104edbb9d0fd53e3a432cbb3b6b5fb2cb81a962.tar.bz2 | |
hw/mips/jazz: use qemu_find_nic_info()
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'hw/mips/jazz.c')
| -rw-r--r-- | hw/mips/jazz.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c index 0d2348a..5bf3e32 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); |