[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 7/8] x86_64 config: fix compile for CONFIG_IDE_ISA=n
From: |
David Ahern |
Subject: |
[Qemu-devel] [PATCH 7/8] x86_64 config: fix compile for CONFIG_IDE_ISA=n |
Date: |
Wed, 12 Jan 2011 23:34:36 -0700 |
Signed-off-by: David Ahern <address@hidden>
---
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 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);
--
1.7.3.4
- [Qemu-devel] [PATCH 3/8] x86_64 config: fix compile for CONFIG_PARALLEL=n, (continued)
[Qemu-devel] [PATCH 8/8] x86_64 config: fix compile for CONFIG_FDC=n, David Ahern, 2011/01/13
[Qemu-devel] [PATCH 7/8] x86_64 config: fix compile for CONFIG_IDE_ISA=n,
David Ahern <=
[Qemu-devel] [PATCH 4/8] remove unused parallel_* variables from pc.c, David Ahern, 2011/01/13
[Qemu-devel] [PATCH 1/8] fix 'no such file' error from make_device_config.sh, David Ahern, 2011/01/13
Re: [Qemu-devel] [PATCH 1/8] fix 'no such file' error from make_device_config.sh, Stefan Weil, 2011/01/14
Re: [Qemu-devel] [PATCH 0/8] misc cleanups for x86_64 disabling config settings, Isaku Yamahata, 2011/01/13