hw/openrisc/openrisc_sim: use qemu_create_nic_device()
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk> Reviewed-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
parent
2a98878ff4
commit
5fcc51548d
@ -170,7 +170,7 @@ static void openrisc_create_fdt(Or1ksimState *state,
|
||||
|
||||
static void openrisc_sim_net_init(Or1ksimState *state, hwaddr base, hwaddr size,
|
||||
int num_cpus, OpenRISCCPU *cpus[],
|
||||
int irq_pin, NICInfo *nd)
|
||||
int irq_pin)
|
||||
{
|
||||
void *fdt = state->fdt;
|
||||
DeviceState *dev;
|
||||
@ -178,8 +178,10 @@ static void openrisc_sim_net_init(Or1ksimState *state, hwaddr base, hwaddr size,
|
||||
char *nodename;
|
||||
int i;
|
||||
|
||||
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);
|
||||
@ -313,12 +315,10 @@ static void openrisc_sim_init(MachineState *machine)
|
||||
openrisc_create_fdt(state, or1ksim_memmap, smp_cpus, machine->ram_size,
|
||||
machine->kernel_cmdline);
|
||||
|
||||
if (nd_table[0].used) {
|
||||
openrisc_sim_net_init(state, or1ksim_memmap[OR1KSIM_ETHOC].base,
|
||||
or1ksim_memmap[OR1KSIM_ETHOC].size,
|
||||
smp_cpus, cpus,
|
||||
OR1KSIM_ETHOC_IRQ, nd_table);
|
||||
}
|
||||
openrisc_sim_net_init(state, or1ksim_memmap[OR1KSIM_ETHOC].base,
|
||||
or1ksim_memmap[OR1KSIM_ETHOC].size,
|
||||
smp_cpus, cpus,
|
||||
OR1KSIM_ETHOC_IRQ);
|
||||
|
||||
if (smp_cpus > 1) {
|
||||
openrisc_sim_ompic_init(state, or1ksim_memmap[OR1KSIM_OMPIC].base,
|
||||
|
Loading…
Reference in New Issue
Block a user