Patchwork [06/11] config: fix compile for CONFIG_NE2000_ISA=n

login
register
mail settings
Submitter David S. Ahern
Date Jan. 14, 2011, 7:12 p.m.
Message ID <1295032341-6926-7-git-send-email-daahern@cisco.com>
Download mbox | patch
Permalink /patch/79000/
State New
Headers show

Comments

David S. Ahern - Jan. 14, 2011, 7:12 p.m.
Signed-off-by: David Ahern <daahern@cisco.com>
---
 hw/pc.c      |    4 ++++
 hw/pc_piix.c |    2 ++
 2 files changed, 6 insertions(+), 0 deletions(-)

Patch

diff --git a/hw/pc.c b/hw/pc.c
index 6a55d2f..e7514fd 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -822,9 +822,11 @@  static void load_linux(void *fw_cfg,
 
 #define NE2000_NB_MAX 6
 
+#ifdef CONFIG_NE2000_ISA
 static const int ne2000_io[NE2000_NB_MAX] = { 0x300, 0x320, 0x340, 0x360,
                                               0x280, 0x380 };
 static const int ne2000_irq[NE2000_NB_MAX] = { 9, 10, 11, 3, 4, 5 };
+#endif
 
 void pc_audio_init (PCIBus *pci_bus, qemu_irq *pic)
 {
@@ -843,6 +845,7 @@  void pc_audio_init (PCIBus *pci_bus, qemu_irq *pic)
     }
 }
 
+#ifdef CONFIG_NE2000_ISA
 void pc_init_ne2k_isa(NICInfo *nd)
 {
     static int nb_ne2k = 0;
@@ -853,6 +856,7 @@  void pc_init_ne2k_isa(NICInfo *nd)
                     ne2000_irq[nb_ne2k], nd);
     nb_ne2k++;
 }
+#endif
 
 int cpu_is_bsp(CPUState *env)
 {
diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index f82508d..5046947 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -119,9 +119,11 @@  static void pc_init1(ram_addr_t ram_size,
     for(i = 0; i < nb_nics; i++) {
         NICInfo *nd = &nd_table[i];
 
+#ifdef CONFIG_NE2000_ISA
         if (!pci_enabled || (nd->model && strcmp(nd->model, "ne2k_isa") == 0))
             pc_init_ne2k_isa(nd);
         else
+#endif
             pci_nic_init_nofail(nd, "e1000", NULL);
     }