[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 26/28] hw/i386/pc: use qemu_get_nic_info() and pci_init_nic_de
From: |
David Woodhouse |
Subject: |
[PATCH v3 26/28] hw/i386/pc: use qemu_get_nic_info() and pci_init_nic_devices() |
Date: |
Wed, 25 Oct 2023 15:50:40 +0100 |
From: David Woodhouse <dwmw@amazon.co.uk>
Eliminate direct access to nd_table[] and nb_nics by processing the the
ISA NICs first and then calling pci_init_nic_devices() for the test.
It's important to do this *before* the subsequent patch which registers
the Xen PV network devices, because the code being remove here didn't
check whether nd->instantiated was already set before using each entry.
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
---
hw/i386/pc.c | 21 +++++++++++----------
include/hw/net/ne2000-isa.h | 2 --
2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 11fed78d17..7d2ae2b3d7 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -652,8 +652,11 @@ static void pc_init_ne2k_isa(ISABus *bus, NICInfo *nd)
{
static int nb_ne2k = 0;
- if (nb_ne2k == NE2000_NB_MAX)
+ if (nb_ne2k == NE2000_NB_MAX) {
+ error_setg(&error_fatal,
+ "maximum number of ISA NE2000 devices exceeded");
return;
+ }
isa_ne2000_init(bus, ne2000_io[nb_ne2k],
ne2000_irq[nb_ne2k], nd);
nb_ne2k++;
@@ -1294,19 +1297,17 @@ void pc_basic_device_init(struct PCMachineState *pcms,
void pc_nic_init(PCMachineClass *pcmc, ISABus *isa_bus, PCIBus *pci_bus)
{
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);
- for (i = 0; i < nb_nics; i++) {
- NICInfo *nd = &nd_table[i];
- const char *model = nd->model ? nd->model : mc->default_nic;
- 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);
}
+
+ pci_init_nic_devices(pci_bus, mc->default_nic);
+
rom_reset_order_override();
}
diff --git a/include/hw/net/ne2000-isa.h b/include/hw/net/ne2000-isa.h
index af59ee0b02..73bae10ad1 100644
--- a/include/hw/net/ne2000-isa.h
+++ b/include/hw/net/ne2000-isa.h
@@ -22,8 +22,6 @@ static inline ISADevice *isa_ne2000_init(ISABus *bus, int
base, int irq,
{
ISADevice *d;
- qemu_check_nic_model(nd, "ne2k_isa");
-
d = isa_try_new(TYPE_ISA_NE2000);
if (d) {
DeviceState *dev = DEVICE(d);
--
2.40.1
- [PATCH v3 00/28] Get Xen PV shim running in QEMU, add net & console, David Woodhouse, 2023/10/25
- [PATCH v3 14/28] hw/xen: add get_frontend_path() method to XenDeviceClass, David Woodhouse, 2023/10/25
- [PATCH v3 23/28] net: report list of available models according to platform, David Woodhouse, 2023/10/25
- [PATCH v3 26/28] hw/i386/pc: use qemu_get_nic_info() and pci_init_nic_devices(),
David Woodhouse <=
- [PATCH v3 27/28] hw/xen: use qemu_create_nic_bus_devices() to instantiate Xen NICs, David Woodhouse, 2023/10/25
- [PATCH v3 22/28] net: add qemu_{configure, create}_nic_device(), qemu_find_nic_info(), David Woodhouse, 2023/10/25
- [PATCH v3 09/28] hw/xen: Clean up event channel 'type_val' handling to use union, David Woodhouse, 2023/10/25
- [PATCH v3 07/28] hw/xen: use correct default protocol for xen-block on x86, David Woodhouse, 2023/10/25
- [PATCH v3 28/28] docs: update Xen-on-KVM documentation, David Woodhouse, 2023/10/25