From patchwork Fri Jan 14 19:12:18 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "David S. Ahern" X-Patchwork-Id: 78995 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8B7C9B70B3 for ; Sat, 15 Jan 2011 06:18:24 +1100 (EST) Received: from localhost ([127.0.0.1]:36139 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PdpAA-0007fb-Mr for incoming@patchwork.ozlabs.org; Fri, 14 Jan 2011 14:18:18 -0500 Received: from [140.186.70.92] (port=33960 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pdp4e-0005cG-HS for qemu-devel@nongnu.org; Fri, 14 Jan 2011 14:12:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pdp4c-0007Ji-M5 for qemu-devel@nongnu.org; Fri, 14 Jan 2011 14:12:36 -0500 Received: from sj-iport-5.cisco.com ([171.68.10.87]:2663) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pdp4c-0007IX-BG for qemu-devel@nongnu.org; Fri, 14 Jan 2011 14:12:34 -0500 Authentication-Results: sj-iport-5.cisco.com; dkim=neutral (message not signed) header.i=none Received: from sj-core-5.cisco.com ([171.71.177.238]) by sj-iport-5.cisco.com with ESMTP; 14 Jan 2011 19:12:34 +0000 Received: from daahern-lx.cisco.com (sjc-daahern-8915.cisco.com [10.20.182.150]) by sj-core-5.cisco.com (8.13.8/8.14.3) with ESMTP id p0EJCNrp004346; Fri, 14 Jan 2011 19:12:33 GMT From: David Ahern To: qemu-devel@nongnu.org Date: Fri, 14 Jan 2011 12:12:18 -0700 Message-Id: <1295032341-6926-9-git-send-email-daahern@cisco.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1295032341-6926-1-git-send-email-daahern@cisco.com> References: <1295032341-6926-1-git-send-email-daahern@cisco.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: David Ahern Subject: [Qemu-devel] [PATCH 08/11] config: fix compile for CONFIG_IDE_ISA=n X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: David Ahern --- hw/pc_piix.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 7d65e37..68f602f 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -38,9 +38,11 @@ #define MAX_IDE_BUS 2 +#ifdef CONFIG_IDE_ISA static const int ide_iobase[MAX_IDE_BUS] = { 0x1f0, 0x170 }; static const int ide_iobase2[MAX_IDE_BUS] = { 0x3f6, 0x376 }; static const int ide_irq[MAX_IDE_BUS] = { 14, 15 }; +#endif static void ioapic_init(IsaIrqState *isa_irq_state) { @@ -141,6 +143,7 @@ static void pc_init1(ram_addr_t ram_size, dev = pci_piix3_ide_init(pci_bus, hd, piix3_devfn + 1); idebus[0] = qdev_get_child_bus(&dev->qdev, "ide.0"); idebus[1] = qdev_get_child_bus(&dev->qdev, "ide.1"); +#ifdef CONFIG_IDE_ISA } else { for(i = 0; i < MAX_IDE_BUS; i++) { ISADevice *dev; @@ -149,6 +152,12 @@ static void pc_init1(ram_addr_t ram_size, idebus[i] = qdev_get_child_bus(&dev->qdev, "ide.0"); } } +#else + } else { + idebus[0] = NULL; + idebus[1] = NULL; + } +#endif pc_audio_init(pci_enabled ? pci_bus : NULL, isa_irq);