On 22/02/2024 08.57, Philippe Mathieu-Daudé wrote:
On 21/2/24 12:00, Thomas Huth wrote:
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.
Signed-off-by: Thomas Huth <th...@redhat.com>
---
hw/intc/Kconfig | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
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
This is odd, we usually 'select' dependencies.
We could also move the two select lines into the VIRT Kconfig switch in
hw/arm/ ... would that look better?
+ select MSI_NONBROKEN
+
config ARM_GICV3_TCG
bool
- default y
Don't we want instead:
default y if TCG
No, that won't fix the issue, since such statements will also be set to "no"
if you run configure --without-default-devices.
Thomas
