| Message ID | 20230711143426.708978-1-clg@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | s390x: Fix QEMU abort by selecting S390_FLIC_KVM | expand |
On 11/7/23 16:34, Cédric Le Goater wrote: > 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 <clg@redhat.com> > --- > hw/intc/Kconfig | 1 - > hw/s390x/Kconfig | 1 + > 2 files changed, 1 insertion(+), 1 deletion(-) > diff --git a/hw/s390x/Kconfig b/hw/s390x/Kconfig > index 5e7d8a2bae8b..0dad184e06d2 100644 > --- a/hw/s390x/Kconfig > +++ b/hw/s390x/Kconfig > @@ -7,6 +7,7 @@ config S390_CCW_VIRTIO > imply WDT_DIAG288 > select PCI > select S390_FLIC > + select S390_FLIC_KVM select S390_FLIC_KVM if KVM? > select SCLPCONSOLE > select VIRTIO_CCW > select MSI_NONBROKEN
diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig index 21441d0a0c43..97d550b06b77 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 5e7d8a2bae8b..0dad184e06d2 100644 --- a/hw/s390x/Kconfig +++ b/hw/s390x/Kconfig @@ -7,6 +7,7 @@ config S390_CCW_VIRTIO imply WDT_DIAG288 select PCI select S390_FLIC + select S390_FLIC_KVM select SCLPCONSOLE select VIRTIO_CCW select MSI_NONBROKEN
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 <clg@redhat.com> --- hw/intc/Kconfig | 1 - hw/s390x/Kconfig | 1 + 2 files changed, 1 insertion(+), 1 deletion(-)