[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/12] hw/i386: Fix linker error when ISAPC is disabl
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 11/12] hw/i386: Fix linker error when ISAPC is disabled |
Date: |
Fri, 5 Jul 2019 22:23:21 +0200 |
From: Julio Montes <address@hidden>
v2: include config-devices.h to use CONFIG_IDE_ISA
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: Julio Montes <address@hidden>
---
hw/i386/pc_piix.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index c07c4a5..cc04c01 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -23,6 +23,7 @@
*/
#include "qemu/osdep.h"
+#include "config-devices.h"
#include "qemu/units.h"
#include "hw/hw.h"
@@ -61,9 +62,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
/* PC hardware initialisation */
static void pc_init1(MachineState *machine,
@@ -254,7 +257,10 @@ static void pc_init1(MachineState *machine,
}
idebus[0] = qdev_get_child_bus(&dev->qdev, "ide.0");
idebus[1] = qdev_get_child_bus(&dev->qdev, "ide.1");
- } else {
+ pc_cmos_init(pcms, idebus[0], idebus[1], rtc_state);
+ }
+#ifdef CONFIG_IDE_ISA
+else {
for(i = 0; i < MAX_IDE_BUS; i++) {
ISADevice *dev;
char busname[] = "ide.0";
@@ -268,9 +274,9 @@ static void pc_init1(MachineState *machine,
busname[4] = '0' + i;
idebus[i] = qdev_get_child_bus(DEVICE(dev), busname);
}
+ pc_cmos_init(pcms, idebus[0], idebus[1], rtc_state);
}
-
- pc_cmos_init(pcms, idebus[0], idebus[1], rtc_state);
+#endif
if (pcmc->pci_enabled && machine_usb(machine)) {
pci_create_simple(pci_bus, piix3_devfn + 2, "piix3-usb-uhci");
--
1.8.3.1
- Re: [Qemu-devel] [PULL 00/12] Misc bugfixes for QEMU hard freeze, (continued)
- Re: [Qemu-devel] [PULL 00/12] Misc bugfixes for QEMU hard freeze, Paolo Bonzini, 2019/07/05
- Re: [Qemu-devel] [PULL 00/12] Misc bugfixes for QEMU hard freeze, Eric Blake, 2019/07/06
- Re: [Qemu-devel] [PULL 00/12] Misc bugfixes for QEMU hard freeze, no-reply, 2019/07/06
- [Qemu-devel] [PULL 00/12] Misc bugfixes for QEMU hard freeze, Paolo Bonzini, 2019/07/05
- [Qemu-devel] [PULL 01/12] pc: fix possible NULL pointer dereference in pc_machine_get_device_memory_region_size(), Paolo Bonzini, 2019/07/05
- [Qemu-devel] [PULL 07/12] target/i386: fix feature check in hyperv-stub.c, Paolo Bonzini, 2019/07/05
- [Qemu-devel] [PULL 05/12] intel_iommu: Fix unexpected unmaps during global unmap, Paolo Bonzini, 2019/07/05
- [Qemu-devel] [PULL 02/12] checkpatch: do not warn for multiline parenthesized returned value, Paolo Bonzini, 2019/07/05
- [Qemu-devel] [PULL 04/12] intel_iommu: Fix incorrect "end" for vtd_address_space_unmap, Paolo Bonzini, 2019/07/05
- [Qemu-devel] [PULL 11/12] hw/i386: Fix linker error when ISAPC is disabled,
Paolo Bonzini <=
- [Qemu-devel] [PULL 09/12] target/i386: kvm: Fix when nested state is needed for migration, Paolo Bonzini, 2019/07/05
- [Qemu-devel] [PULL 10/12] Makefile: generate header file with the list of devices enabled, Paolo Bonzini, 2019/07/05
- [Qemu-devel] [PULL 06/12] ioapic: clear irq_eoi when updating the ioapic redirect table entry, Paolo Bonzini, 2019/07/05
- [Qemu-devel] [PULL 03/12] i386/kvm: Fix build with -m32, Paolo Bonzini, 2019/07/05
- [Qemu-devel] [PULL 12/12] ioapic: use irq number instead of vector in ioapic_eoi_broadcast, Paolo Bonzini, 2019/07/05
- [Qemu-devel] [PULL 08/12] minikconf: do not include variables from MINIKCONF_ARGS in config-all-devices.mak, Paolo Bonzini, 2019/07/05
- Re: [Qemu-devel] [PULL 00/12] Misc bugfixes for QEMU hard freeze, Peter Maydell, 2019/07/08