commit 4921d0a7535bc33415564d487ea17ba91a34082f
author Paolo Bonzini <pbonzini@redhat.com> Thu Jan 25 13:36:37 2024 +0100
committer Paolo Bonzini <pbonzini@redhat.com> Fri May 03 15:47:47 2024 +0200
tree 87cc0ab6f2fdc5b290d7dbc72276ab7dada7bc9d
parent 9e6190aecd37510dc111f7a41fed8f08ff14630c

i386: switch boards to "default y"

Some targets use "default y" for boards to filter out those that require
TCG.  For consistency we are switching all other targets to do the same.
Continue with i386.

No changes to generated config-devices.mak files, other than
adding CONFIG_I386 to the x86_64-softmmu target.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

.gitlab-ci.d/buildtest.yml

diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml
index 6531758..75222c4 100644
--- a/.gitlab-ci.d/buildtest.yml
+++ b/.gitlab-ci.d/buildtest.yml
@@ -648,7 +648,8 @@
     - make check-tcg
 
 # Check our reduced build configurations
-# requires libfdt: aarch64, arm
+# requires libfdt: aarch64, arm, i386, x86_64
+# does not build without boards: i386, x86_64
 build-without-defaults:
   extends: .native_build_job_template
   needs:

configs/devices/i386-softmmu/default.mak

diff --git a/configs/devices/i386-softmmu/default.mak b/configs/devices/i386-softmmu/default.mak
index 598c664..448e3e3 100644
--- a/configs/devices/i386-softmmu/default.mak
+++ b/configs/devices/i386-softmmu/default.mak
@@ -24,9 +24,8 @@
 #CONFIG_VTD=n
 #CONFIG_SGX=n
 
-# Boards:
-#
-CONFIG_ISAPC=y
-CONFIG_I440FX=y
-CONFIG_Q35=y
-CONFIG_MICROVM=y
+# Boards are selected by default, uncomment to keep out of the build.
+# CONFIG_ISAPC=n
+# CONFIG_I440FX=n
+# CONFIG_Q35=n
+# CONFIG_MICROVM=n

hw/i386/Kconfig

diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig
index a6ee052..4362164 100644
--- a/hw/i386/Kconfig
+++ b/hw/i386/Kconfig
@@ -66,6 +66,8 @@
 
 config I440FX
     bool
+    default y
+    depends on I386
     imply E1000_PCI
     imply VMPORT
     imply VMMOUSE
@@ -81,6 +83,8 @@
 
 config ISAPC
     bool
+    default y
+    depends on I386
     imply VGA_ISA
     select ISA_BUS
     select PC
@@ -91,6 +95,8 @@
 
 config Q35
     bool
+    default y
+    depends on I386
     imply VTD
     imply AMD_IOMMU
     imply E1000E_PCI_EXPRESS
@@ -108,6 +114,8 @@
 
 config MICROVM
     bool
+    default y
+    depends on I386
     select SERIAL_ISA # for serial_hds_isa_init()
     select ISA_BUS
     select APIC
@@ -142,4 +150,4 @@
 config XEN_EMU
     bool
     default y
-    depends on KVM && (I386 || X86_64)
+    depends on KVM && I386

target/i386/Kconfig

diff --git a/target/i386/Kconfig b/target/i386/Kconfig
index 4689894..ad9291d 100644
--- a/target/i386/Kconfig
+++ b/target/i386/Kconfig
@@ -5,3 +5,4 @@
 
 config X86_64
     bool
+    select I386