[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/11] config: fix compile for CONFIG_NE2000_ISA=n
From: |
David Ahern |
Subject: |
[Qemu-devel] [PATCH 06/11] config: fix compile for CONFIG_NE2000_ISA=n |
Date: |
Fri, 14 Jan 2011 12:12:16 -0700 |
Signed-off-by: David Ahern <address@hidden>
---
hw/pc.c | 4 ++++
hw/pc_piix.c | 2 ++
2 files changed, 6 insertions(+), 0 deletions(-)
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);
}
--
1.7.3.4
- Re: [Qemu-devel] [PATCH 02/11] config: settings from default-configs need to be included in header files, (continued)
- Re: [Qemu-devel] [PATCH 02/11] config: settings from default-configs need to be included in header files, Blue Swirl, 2011/01/14
- Re: [Qemu-devel] [PATCH 02/11] config: settings from default-configs need to be included in header files, David Ahern, 2011/01/14
- Re: [Qemu-devel] [PATCH 02/11] config: settings from default-configs need to be included in header files, Blue Swirl, 2011/01/14
- Re: [Qemu-devel] [PATCH 02/11] config: settings from default-configs need to be included in header files, David Ahern, 2011/01/14
- Re: [Qemu-devel] [PATCH 02/11] config: settings from default-configs need to be included in header files, Blue Swirl, 2011/01/14
- Re: [Qemu-devel] [PATCH 02/11] config: settings from default-configs need to be included in header files, David Ahern, 2011/01/14
- [Qemu-devel] Re: [PATCH 02/11] config: settings from default-configs need to be included in header files, Paolo Bonzini, 2011/01/15
- [Qemu-devel] Re: [PATCH 02/11] config: settings from default-configs need to be included in header files, Blue Swirl, 2011/01/15
[Qemu-devel] [PATCH 03/11] config: fix compile for CONFIG_VMWARE_VGA=n, David Ahern, 2011/01/14
[Qemu-devel] [PATCH 04/11] config: fix compile for CONFIG_PARALLEL=n, David Ahern, 2011/01/14
[Qemu-devel] [PATCH 06/11] config: fix compile for CONFIG_NE2000_ISA=n,
David Ahern <=
[Qemu-devel] [PATCH 05/11] remove unused parallel_* variables from pc.c, David Ahern, 2011/01/14
[Qemu-devel] [PATCH 07/11] config: handle CONFIG_VGA_ISA=n, David Ahern, 2011/01/14
[Qemu-devel] [PATCH 08/11] config: fix compile for CONFIG_IDE_ISA=n, David Ahern, 2011/01/14
[Qemu-devel] [PATCH 09/11] config: fix compile for CONFIG_FDC=n, David Ahern, 2011/01/14
[Qemu-devel] [PATCH 10/11] config: add CONFIG_APPLESMC, David Ahern, 2011/01/14
[Qemu-devel] [PATCH 11/11] config: allow none as a configure option to disable all sound cards, David Ahern, 2011/01/14