@@ -1167,6 +1167,21 @@ void pc_basic_device_init(qemu_irq *isa_irq,
fdctrl_init_isa(fd);
}
+void pc_nic_init(PCIBus *pci_bus)
+{
+ int i;
+
+ for(i = 0; i < nb_nics; i++) {
+ NICInfo *nd = &nd_table[i];
+
+ if (!pci_bus || (nd->model && strcmp(nd->model, "ne2k_isa") == 0)) {
+ pc_init_ne2k_isa(nd);
+ } else {
+ pci_nic_init_nofail(nd, "e1000", NULL);
+ }
+ }
+}
+
void pc_pci_device_init(PCIBus *pci_bus)
{
int max_bus;
@@ -144,6 +144,7 @@ void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size,
const char *boot_device,
BusState *ide0, BusState *ide1,
ISADevice *s);
+void pc_nic_init(PCIBus *pci_bus);
void pc_pci_device_init(PCIBus *pci_bus);
typedef void (*cpu_set_smm_t)(int smm, void *arg);
@@ -115,14 +115,7 @@ static void pc_init1(ram_addr_t ram_size,
/* init basic PC hardware */
pc_basic_device_init(isa_irq, &rtc_state);
- for(i = 0; i < nb_nics; i++) {
- NICInfo *nd = &nd_table[i];
-
- if (!pci_enabled || (nd->model && strcmp(nd->model, "ne2k_isa") == 0))
- pc_init_ne2k_isa(nd);
- else
- pci_nic_init_nofail(nd, "e1000", NULL);
- }
+ pc_nic_init(pci_bus);
ide_drive_get(hd, MAX_IDE_BUS);
if (pci_enabled) {
Factor out pc nic initialization. This simplifies the pc initialization and will reduce the code duplication of q35 pc initialization. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> --- hw/pc.c | 15 +++++++++++++++ hw/pc.h | 1 + hw/pc_piix.c | 9 +-------- 3 files changed, 17 insertions(+), 8 deletions(-)