[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH for-8.3 v2 36/46] hw/mips/jazz: use qemu_find_nic_info()
From: |
David Woodhouse |
Subject: |
[PATCH for-8.3 v2 36/46] hw/mips/jazz: use qemu_find_nic_info() |
Date: |
Mon, 6 Nov 2023 19:49:41 +0000 |
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.
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 d33a76ad4d..39a82fc2be 100644
--- a/hw/mips/jazz.c
+++ b/hw/mips/jazz.c
@@ -113,15 +113,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);
@@ -316,12 +320,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);
--
2.41.0
- Re: [PATCH for-8.3 v2 04/46] hw/pci: add pci_init_nic_devices(), pci_init_nic_in_slot(), (continued)
- [PATCH for-8.3 v2 02/46] net: report list of available models according to platform, David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 44/46] hw/pci: remove pci_nic_init_nofail(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 19/46] hw/sparc64/sun4u: use pci_init_nic_devices(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 17/46] hw/ppc: use pci_init_nic_devices(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 29/46] hw/arm/stellaris: use qemu_find_nic_info(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 27/46] hw/arm/highbank: use qemu_create_nic_device(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 45/46] net: remove qemu_show_nic_models(), qemu_find_nic_model(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 14/46] hw/mips/loongson3_virt: use pci_init_nic_devices(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 39/46] hw/riscv: use qemu_configure_nic_device(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 36/46] hw/mips/jazz: use qemu_find_nic_info(),
David Woodhouse <=
- [PATCH for-8.3 v2 05/46] hw/i386/pc: use qemu_get_nic_info() and pci_init_nic_devices(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 42/46] hw/xtensa/xtfpga: use qemu_create_nic_device(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 12/46] hw/mips/fuloong2e: use pci_init_nic_devices(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 33/46] hw/m68k/q800: use qemu_find_nic_info(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 09/46] hw/arm/virt: use pci_init_nic_devices(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 23/46] hw/arm/exynos4: use qemu_create_nic_device(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 40/46] hw/s390x/s390-virtio-ccw: use qemu_create_nic_device(), David Woodhouse, 2023/11/06
- [PATCH for-8.3 v2 08/46] hw/arm/sbsa-ref: use pci_init_nic_devices(), David Woodhouse, 2023/11/06