@@ -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)
{
@@ -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);
}
Signed-off-by: David Ahern <daahern@cisco.com> --- hw/pc.c | 4 ++++ hw/pc_piix.c | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-)