Skip to contentSkip to conversation

s390x: Fix QEMU abort by selecting S390_FLIC_KVM

PATCH In review Cédric Le Goater 2 participants 2 messages Jul 11, 2023

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 s390x: Fix QEMU abort by selecting S390_FLIC_KVM

If QEMU is built with --without-default-devices, the s390-flic-kvm device is missing and QEMU aborts when started with the KVM accelerator. Make sure it's available by selecting S390_FLIC_KVM in Kconfig.

Consequently, this also fixes an abort in tests/qtest/migration-test.

---
 hw/intc/Kconfig  | 1 -
 hw/s390x/Kconfig | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)
hw/intc/Kconfig +0 -1
index 21441d0a0c43..97d550b06b77 100644
@@ -49,7 +49,6 @@ config S390_FLIC
 
 config S390_FLIC_KVM
     bool
-    default y
     depends on S390_FLIC && KVM
 
 config OMPIC
hw/s390x/Kconfig +1 -0
index 5e7d8a2bae8b..454e0ff4b613 100644
@@ -7,6 +7,7 @@ config S390_CCW_VIRTIO
     imply WDT_DIAG288
     select PCI
     select S390_FLIC
+    select S390_FLIC_KVM if KVM
     select SCLPCONSOLE
     select VIRTIO_CCW
     select MSI_NONBROKEN
Signature · 1 line
2.41.0
Reviewed-by on v2 1/1
#1 lore raw
Quoted 11 lines · Cédric Le Goater

If QEMU is built with --without-default-devices, the s390-flic-kvm device is missing and QEMU aborts when started with the KVM accelerator. Make sure it's available by selecting S390_FLIC_KVM in Kconfig.

Consequently, this also fixes an abort in tests/qtest/migration-test.

---
  hw/intc/Kconfig  | 1 -
  hw/s390x/Kconfig | 1 +
  2 files changed, 1 insertion(+), 1 deletion(-)