From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=33936 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pdp4c-0005aJ-O5 for qemu-devel@nongnu.org; Fri, 14 Jan 2011 14:12:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pdp4b-0007JL-HS for qemu-devel@nongnu.org; Fri, 14 Jan 2011 14:12:34 -0500 Received: from sj-iport-4.cisco.com ([171.68.10.86]:26013) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pdp4b-0007Iz-DI for qemu-devel@nongnu.org; Fri, 14 Jan 2011 14:12:33 -0500 From: David Ahern Date: Fri, 14 Jan 2011 12:12:16 -0700 Message-Id: <1295032341-6926-7-git-send-email-daahern@cisco.com> In-Reply-To: <1295032341-6926-1-git-send-email-daahern@cisco.com> References: <1295032341-6926-1-git-send-email-daahern@cisco.com> Subject: [Qemu-devel] [PATCH 06/11] config: fix compile for CONFIG_NE2000_ISA=n List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: David Ahern Signed-off-by: David Ahern --- 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