[Qemu-devel] [PATCH] hw/i386: The i440fx is not a machine, remove it from the machine list

[Philippe Mathieu-Daudé]

When building with CONFIG_ISAPC=n and CONFIG_I440FX=y we get:

  $ make subdir-x86_64-softmmu
  [...]
  /usr/bin/ld: hw/i386/pc_piix.o: in function `pc_init1':
  /source/qemu/hw/i386/pc_piix.c:261: undefined reference to `isa_ide_init'
  /usr/bin/ld: /source/qemu/hw/i386/pc_piix.c:261: undefined reference to 
`isa_ide_init'
  collect2: error: ld returned 1 exit status
  make[1]: *** [Makefile:204: qemu-system-x86_64] Error 1

This is because the I440FX device is a North Bridge, not a machine.
It is however used by the ISAPC machine.

Correct the dependency in the ISAPC Kconfig.

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
 default-configs/i386-softmmu.mak | 1 -
 hw/i386/Kconfig                  | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
index ba3fb3ff50a..b33f5952128 100644
--- a/default-configs/i386-softmmu.mak
+++ b/default-configs/i386-softmmu.mak
@@ -23,5 +23,4 @@
 # Boards:
 #
 CONFIG_ISAPC=y
-CONFIG_I440FX=y
 CONFIG_Q35=y
diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig
index a6aed7c1313..9211adf2bb3 100644
--- a/hw/i386/Kconfig
+++ b/hw/i386/Kconfig
@@ -69,7 +69,7 @@ config ISAPC
     select VGA_ISA
     # FIXME: it is in the same file as i440fx, and does not compile
     # if separated
-    depends on I440FX
+    select I440FX
 
 config Q35
     bool
-- 
2.20.1