From d9458f990afa1633b99d0d897d3e48689d6a01ed Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Le=20Goater?= Date: Tue, 11 Jul 2023 17:14:40 +0200 Subject: [PATCH] s390x: Fix QEMU abort by selecting S390_FLIC_KVM MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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. Signed-off-by: Cédric Le Goater Message-Id: <20230711151440.716822-1-clg@redhat.com> Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Thomas Huth --- hw/intc/Kconfig | 1 - hw/s390x/Kconfig | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig index 21441d0a0c..97d550b06b 100644 --- a/hw/intc/Kconfig +++ b/hw/intc/Kconfig @@ -49,7 +49,6 @@ config S390_FLIC config S390_FLIC_KVM bool - default y depends on S390_FLIC && KVM config OMPIC diff --git a/hw/s390x/Kconfig b/hw/s390x/Kconfig index e8d4d68ece..4c068d7960 100644 --- a/hw/s390x/Kconfig +++ b/hw/s390x/Kconfig @@ -8,6 +8,7 @@ config S390_CCW_VIRTIO imply PCIE_DEVICES select PCI_EXPRESS select S390_FLIC + select S390_FLIC_KVM if KVM select SCLPCONSOLE select VIRTIO_CCW select MSI_NONBROKEN -- 2.11.0