Patchwork [17/26] pc, pc_piix: split out pc nic initialization

login
register
mail settings
Submitter Isaku Yamahata
Date March 16, 2011, 9:29 a.m.
Message ID <bdd4b645b598a44b0f4a77a937d106da89138fda.1300266238.git.yamahata@valinux.co.jp>
Download mbox | patch
Permalink /patch/87201/
State New
Headers show

Comments

Isaku Yamahata - March 16, 2011, 9:29 a.m.
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(-)

Patch

diff --git a/hw/pc.c b/hw/pc.c
index 39c7cf0..dc771a6 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -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;
diff --git a/hw/pc.h b/hw/pc.h
index 0ee4b89..b70c5f4 100644
--- a/hw/pc.h
+++ b/hw/pc.h
@@ -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);
diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index 1ac69ff..8ee7cab 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -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) {