OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

hw/i386/pc: use qemu_get_nic_info() and pci_init_nic_devices()

Browse Source 
Eliminate direct access to nd_table[] and nb_nics by processing the the
Xen and ISA NICs first and then calling pci_init_nic_devices() for the
rest.

Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Paul Durrant <paul@xen.org>
This commit is contained in:
David Woodhouse 2023-10-20 00:07:45 +01:00
parent 1785ae69ea
commit 8d39f9ba14
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
hw/i386/pc.c
View File

@ -654,15 +654,19 @@ static const int ne2000_io[NE2000_NB_MAX] = { 0x300, 0x320, 0x340, 0x360,
0x280, 0x380 }; 0x280, 0x380 };
static const int ne2000_irq[NE2000_NB_MAX] = { 9, 10, 11, 3, 4, 5 }; static const int ne2000_irq[NE2000_NB_MAX] = { 9, 10, 11, 3, 4, 5 };
static void pc_init_ne2k_isa(ISABus *bus, NICInfo *nd) static gboolean pc_init_ne2k_isa(ISABus *bus, NICInfo *nd, Error **errp)
{ {
static int nb_ne2k = 0; static int nb_ne2k = 0;
if (nb_ne2k == NE2000_NB_MAX) if (nb_ne2k == NE2000_NB_MAX) {
return; error_setg(errp,
"maximum number of ISA NE2000 devices exceeded");
return false;
}
isa_ne2000_init(bus, ne2000_io[nb_ne2k], isa_ne2000_init(bus, ne2000_io[nb_ne2k],
ne2000_irq[nb_ne2k], nd); ne2000_irq[nb_ne2k], nd);
nb_ne2k++; nb_ne2k++;
return true;
} }
void pc_acpi_smi_interrupt(void *opaque, int irq, int level) void pc_acpi_smi_interrupt(void *opaque, int irq, int level)
@ -1297,23 +1301,26 @@ void pc_nic_init(PCMachineClass *pcmc, ISABus *isa_bus, PCIBus *pci_bus,
BusState *xen_bus) BusState *xen_bus)
{ {
MachineClass *mc = MACHINE_CLASS(pcmc); MachineClass *mc = MACHINE_CLASS(pcmc);
int i; bool default_is_ne2k = g_str_equal(mc->default_nic, TYPE_ISA_NE2000);
NICInfo *nd;
rom_set_order_override(FW_CFG_ORDER_OVERRIDE_NIC); rom_set_order_override(FW_CFG_ORDER_OVERRIDE_NIC);
for (i = 0; i < nb_nics; i++) {
NICInfo *nd = &nd_table[i];
const char *model = nd->model ? nd->model : mc->default_nic;
if (xen_bus && (!nd->model || g_str_equal(model, "xen-net-device"))) { if (xen_bus) {
while ((nd = qemu_find_nic_info("xen-net-device", true, NULL))) {
DeviceState *dev = qdev_new("xen-net-device"); DeviceState *dev = qdev_new("xen-net-device");
qdev_set_nic_properties(dev, nd); qdev_set_nic_properties(dev, nd);
qdev_realize_and_unref(dev, xen_bus, &error_fatal); qdev_realize_and_unref(dev, xen_bus, &error_fatal);
} else if (g_str_equal(model, "ne2k_isa")) {
pc_init_ne2k_isa(isa_bus, nd);
} else {
pci_nic_init_nofail(nd, pci_bus, model, NULL);
} }
} }
while ((nd = qemu_find_nic_info(TYPE_ISA_NE2000, default_is_ne2k, NULL))) {
pc_init_ne2k_isa(isa_bus, nd, &error_fatal);
}
/* Anything remaining should be a PCI NIC */
pci_init_nic_devices(pci_bus, mc->default_nic);
rom_reset_order_override(); rom_reset_order_override();
} }

2
include/hw/net/ne2000-isa.h
View File

@ -22,8 +22,6 @@ static inline ISADevice *isa_ne2000_init(ISABus *bus, int base, int irq,
{ {
ISADevice *d; ISADevice *d;
qemu_check_nic_model(nd, "ne2k_isa");
d = isa_try_new(TYPE_ISA_NE2000); d = isa_try_new(TYPE_ISA_NE2000);
if (d) { if (d) {
DeviceState *dev = DEVICE(d); DeviceState *dev = DEVICE(d);