motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-06 17:23:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/net/smc91c111: use qemu_configure_nic_device()

Browse source 
Some callers instantiate the device unconditionally, others will do so only
if there is a NICInfo to go with it. This appears to be fairly random, but
preserve the existing behaviour of each caller for now.

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:35 +01:00
parent 8cef839c2d
commit cd53991de4
7 changed files with 22 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

23
hw/arm/realview.c
View file

@ -90,7 +90,6 @@ static void realview_init(MachineState *machine,
I2CBus *i2c;
int n;
unsigned int smp_cpus = machine->smp.cpus;
int done_nic = 0;
qemu_irq cpu_irq[4];
int is_mpcore = 0;
int is_pb = 0;
@ -296,24 +295,20 @@ static void realview_init(MachineState *machine,
n--;
}
}
for(n = 0; n < nb_nics; n++) {
nd = &nd_table[n];
if (!done_nic && (!nd->model ||
strcmp(nd->model, is_pb ? "lan9118" : "smc91c111") == 0)) {
if (is_pb) {
lan9118_init(nd, 0x4e000000, pic[28]);
} else {
smc91c111_init(nd, 0x4e000000, pic[28]);
}
done_nic = 1;
nd = qemu_find_nic_info(is_pb ? "lan9118" : "smc91c111", true, NULL);
if (nd) {
if (is_pb) {
lan9118_init(nd, 0x4e000000, pic[28]);
} else {
if (pci_bus) {
pci_nic_init_nofail(nd, pci_bus, "rtl8139", NULL);
}
smc91c111_init(0x4e000000, pic[28]);
}
}
if (pci_bus) {
pci_init_nic_devices(pci_bus, "rtl8139");
}
dev = sysbus_create_simple(TYPE_ARM_SBCON_I2C, 0x10002000, NULL);
i2c = (I2CBus *)qdev_get_child_bus(dev, "i2c");
i2c_slave_create_simple(i2c, "ds1338", 0x68);