[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 41/45] hw/xtensa/xtfpga: use qemu_create_nic_device()
From: |
David Woodhouse |
Subject: |
[PATCH 41/45] hw/xtensa/xtfpga: use qemu_create_nic_device() |
Date: |
Sun, 22 Oct 2023 16:51:56 +0100 |
From: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
---
hw/xtensa/xtfpga.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c
index fbad1c83a3..519e461354 100644
--- a/hw/xtensa/xtfpga.c
+++ b/hw/xtensa/xtfpga.c
@@ -147,8 +147,10 @@ static void xtfpga_net_init(MemoryRegion *address_space,
SysBusDevice *s;
MemoryRegion *ram;
- dev = qdev_new("open_eth");
- qdev_set_nic_properties(dev, nd);
+ dev = qemu_create_nic_device("open_eth", true, NULL);
+ if (!dev) {
+ return;
+ }
s = SYS_BUS_DEVICE(dev);
sysbus_realize_and_unref(s, &error_fatal);
@@ -301,10 +303,7 @@ static void xtfpga_init(const XtfpgaBoardDesc *board,
MachineState *machine)
memory_region_add_subregion(system_memory, board->io[1], io);
}
xtfpga_fpga_init(system_io, 0x0d020000, freq);
- if (nd_table[0].used) {
- xtfpga_net_init(system_io, 0x0d030000, 0x0d030400, 0x0d800000,
- extints[1], nd_table);
- }
+ xtfpga_net_init(system_io, 0x0d030000, 0x0d030400, 0x0d800000, extints[1]);
serial_mm_init(system_io, 0x0d050020, 2, extints[0],
115200, serial_hd(0), DEVICE_NATIVE_ENDIAN);
--
2.40.1
- Re: [PATCH 18/45] hw/sh4/r2d: use pci_init_nic_devices(), (continued)
- [PATCH 27/45] hw/arm/highbank: use qemu_create_nic_device(), David Woodhouse, 2023/10/22
- [PATCH 32/45] hw/m68k/mcf5208: use qemu_create_nic_device(), David Woodhouse, 2023/10/22
- [PATCH 35/45] hw/mips: use qemu_create_nic_device(), David Woodhouse, 2023/10/22
- [PATCH 24/45] hw/arm/fsl: use qemu_configure_nic_device(), David Woodhouse, 2023/10/22
- [PATCH 08/45] hw/arm/sbsa-ref: use pci_init_nic_devices(), David Woodhouse, 2023/10/22
- [PATCH 37/45] hw/openrisc/openrisc_sim: use qemu_create_nic_device(), David Woodhouse, 2023/10/22
- [PATCH 16/45] hw/ppc/spapr: use qemu_get_nic_info() and pci_init_nic_devices(), David Woodhouse, 2023/10/22
- [PATCH 02/45] net: report list of available models according to platform, David Woodhouse, 2023/10/22
- [PATCH 41/45] hw/xtensa/xtfpga: use qemu_create_nic_device(),
David Woodhouse <=
- [PATCH 40/45] hw/sparc/sun4m: use qemu_configure_nic_device(), David Woodhouse, 2023/10/22
- [PATCH 07/45] hw/alpha/dp264: use pci_init_nic_devices(), David Woodhouse, 2023/10/22
- [PATCH 06/45] hw/xen: use qemu_create_nic_bus_devices() to instantiate Xen NICs, David Woodhouse, 2023/10/22
- [PATCH 38/45] hw/riscv: use qemu_configure_nic_device(), David Woodhouse, 2023/10/22
- [PATCH 20/45] hw/xtensa/virt: use pci_init_nic_devices(), David Woodhouse, 2023/10/22
- [PATCH 30/45] hw/arm: use qemu_configure_nic_device(), David Woodhouse, 2023/10/22
- [PATCH 04/45] hw/pci: add pci_init_nic_devices(), pci_init_nic_in_slot(), David Woodhouse, 2023/10/22
- [PATCH 22/45] hw/arm/aspeed: use qemu_configure_nic_device(), David Woodhouse, 2023/10/22