All of lore.kernel.org
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH] hw/i386: Fix linker error when ISAPC is disabled
@ 2019-07-03 15:49 Julio Montes
  2019-07-03 16:21 ` Paolo Bonzini
                   ` (2 more replies)
  0 siblings, 3 replies; 17+ messages in thread
From: Julio Montes @ 2019-07-03 15:49 UTC (permalink / raw)
  To: qemu-devel; +Cc: Julio Montes, pbonzini, sgarzare, mst

In pc_init1(), ISA IDE is initialized without checking if ISAPC or IDE_ISA
configs are enabled. This results in a link error when
CONFIG_ISAPC is set to 'n' in the file default-configs/i386-softmmu.mak:

hw/i386/pc_piix.o: In function `pc_init1':
hw/i386/pc_piix.c:261: undefined reference to `isa_ide_init'
hw/i386/pc_piix.c:261: undefined reference to `isa_ide_init'

Place ide_isa code under #ifdef CONFIG_IDE_ISA to fix linker errors

Signed-off-by: Julio Montes <julio.montes@intel.com>
---
 hw/i386/pc_piix.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index c07c4a5b38..b93f9327be 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -61,9 +61,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 +256,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 +273,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");
-- 
2.17.2



^ permalink raw reply related	[flat|nested] 17+ messages in thread

end of thread, other threads:[~2019-07-06  4:22 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-03 15:49 [Qemu-devel] [PATCH] hw/i386: Fix linker error when ISAPC is disabled Julio Montes
2019-07-03 16:21 ` Paolo Bonzini
2019-07-03 16:40   ` Montes, Julio
2019-07-03 21:09     ` Paolo Bonzini
2019-07-04 18:03       ` Julio Montes
2019-07-04 19:36         ` no-reply
2019-07-05  8:25         ` Paolo Bonzini
2019-07-05  8:25         ` Paolo Bonzini
2019-07-05 17:20         ` no-reply
2019-07-05 17:25           ` Philippe Mathieu-Daudé
2019-07-05 19:23             ` Montes, Julio
2019-07-03 20:09 ` no-reply
2019-07-05 14:35 ` [Qemu-devel] [PATCH v2 1/2] Makefile: generate header file with the list of devices enabled Julio Montes
2019-07-05 14:35   ` [Qemu-devel] [PATCH v2 2/2] hw/i386: Fix linker error when ISAPC is disabled Julio Montes
2019-07-05 16:34     ` Paolo Bonzini
2019-07-05 19:40     ` Philippe Mathieu-Daudé
2019-07-06  4:21   ` [Qemu-devel] [PATCH v2 1/2] Makefile: generate header file with the list of devices enabled Markus Armbruster

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.