Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-08-16 14:54:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

hw/openrisc/openrisc_sim: use qemu_create_nic_device()

Browse Source 
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:52 +01:00
parent 2a98878ff4
commit 5fcc51548d
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hw/openrisc/openrisc_sim.c
View File

@ -170,7 +170,7 @@ static void openrisc_create_fdt(Or1ksimState *state,
static void openrisc_sim_net_init(Or1ksimState *state, hwaddr base, hwaddr size, static void openrisc_sim_net_init(Or1ksimState *state, hwaddr base, hwaddr size,
int num_cpus, OpenRISCCPU *cpus[], int num_cpus, OpenRISCCPU *cpus[],
int irq_pin, NICInfo *nd) int irq_pin)
{ {
void *fdt = state->fdt; void *fdt = state->fdt;
DeviceState *dev; DeviceState *dev;
@ -178,8 +178,10 @@ static void openrisc_sim_net_init(Or1ksimState *state, hwaddr base, hwaddr size,
char *nodename; char *nodename;
int i; int i;
dev = qdev_new("open_eth"); dev = qemu_create_nic_device("open_eth", true, NULL);
qdev_set_nic_properties(dev, nd); if (!dev) {
return;
}
s = SYS_BUS_DEVICE(dev); s = SYS_BUS_DEVICE(dev);
sysbus_realize_and_unref(s, &error_fatal); sysbus_realize_and_unref(s, &error_fatal);
@ -313,12 +315,10 @@ static void openrisc_sim_init(MachineState *machine)
openrisc_create_fdt(state, or1ksim_memmap, smp_cpus, machine->ram_size, openrisc_create_fdt(state, or1ksim_memmap, smp_cpus, machine->ram_size,
machine->kernel_cmdline); machine->kernel_cmdline);
if (nd_table[0].used) { openrisc_sim_net_init(state, or1ksim_memmap[OR1KSIM_ETHOC].base,
openrisc_sim_net_init(state, or1ksim_memmap[OR1KSIM_ETHOC].base, or1ksim_memmap[OR1KSIM_ETHOC].size,
or1ksim_memmap[OR1KSIM_ETHOC].size, smp_cpus, cpus,
smp_cpus, cpus, OR1KSIM_ETHOC_IRQ);
OR1KSIM_ETHOC_IRQ, nd_table);
}
if (smp_cpus > 1) { if (smp_cpus > 1) {
openrisc_sim_ompic_init(state, or1ksim_memmap[OR1KSIM_OMPIC].base, openrisc_sim_ompic_init(state, or1ksim_memmap[OR1KSIM_OMPIC].base,