From: Thomas Huth <th...@redhat.com>
When using "--without-default-devices", the ARM_GICV3_TCG and ARM_GIC_KVM
settings currently get disabled, though the arm virt machine is only of
very limited use in that case. This also causes the migration-test to
fail in such builds. Let's make sure that we always keep the GIC switches
enabled in the --without-default-devices builds, too.
Message-ID: <20240221110059.152665-1-th...@redhat.com>
Tested-by: Fabiano Rosas <faro...@suse.de>
Signed-off-by: Thomas Huth <th...@redhat.com>
(cherry picked from commit 8bd3f84d1f6fba0edebc450be6fa2c7630584df9)
Signed-off-by: Michael Tokarev <m...@tls.msk.ru>
diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig
index 97d550b06b..2b5b2d2301 100644
--- a/hw/intc/Kconfig
+++ b/hw/intc/Kconfig
@@ -12,10 +12,6 @@ config IOAPIC
bool
select I8259
-config ARM_GIC
- bool
- select MSI_NONBROKEN
-
config OPENPIC
bool
select MSI_NONBROKEN
@@ -25,14 +21,18 @@ config APIC
select MSI_NONBROKEN
select I8259
+config ARM_GIC
+ bool
+ select ARM_GICV3_TCG if TCG
+ select ARM_GIC_KVM if KVM
+ select MSI_NONBROKEN
+
config ARM_GICV3_TCG
bool
- default y
depends on ARM_GIC && TCG
config ARM_GIC_KVM
bool
- default y
depends on ARM_GIC && KVM
config XICS
--
2.39.2
