Patchwork [7/8] x86_64 config: fix compile for CONFIG_IDE_ISA=n

login
register
mail settings
Submitter David S. Ahern
Date Jan. 13, 2011, 6:34 a.m.
Message ID <1294900477-23722-8-git-send-email-daahern@cisco.com>
Download mbox | patch
Permalink /patch/78667/
State New
Headers show

Comments

David S. Ahern - Jan. 13, 2011, 6:34 a.m.
Signed-off-by: David Ahern <daahern@cisco.com>
---
 hw/pc_piix.c |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

Patch

diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index 5046947..e794a82 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);