From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, Richard Henderson <richard.henderson@linaro.org>
Cc: "Cédric Le Goater" <clg@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PULL 1/8] s390x: Fix QEMU abort by selecting S390_FLIC_KVM
Date: Tue, 18 Jul 2023 11:30:33 +0200 [thread overview]
Message-ID: <20230718093040.172145-2-thuth@redhat.com> (raw)
In-Reply-To: <20230718093040.172145-1-thuth@redhat.com>
From: Cédric Le Goater <clg@redhat.com>
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>
Message-Id: <20230711151440.716822-1-clg@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
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.39.3
next prev parent reply other threads:[~2023-07-18 9:32 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-18 9:30 [PULL 0/8] s390x, qtest and misc patches for QEMU 8.1 rc1 Thomas Huth
2023-07-18 9:30 ` Thomas Huth [this message]
2023-07-18 9:30 ` [PULL 2/8] linux-user/elfload: Fix /proc/cpuinfo features: on s390x Thomas Huth
2023-07-18 9:30 ` [PULL 3/8] tests/qtest: Fix typo in multifd cancel test Thomas Huth
2023-07-18 9:30 ` [PULL 4/8] tests/lcitool: Generate distribution packages list in JSON format Thomas Huth
2023-07-18 9:30 ` [PULL 5/8] tests/lcitool: Refresh generated files Thomas Huth
2023-07-18 9:30 ` [PULL 6/8] tests/vm: Introduce get_qemu_packages_from_lcitool_json() helper Thomas Huth
2023-07-18 9:30 ` [PULL 7/8] tests/vm/freebsd: Get up-to-date package list from lcitool vars file Thomas Huth
2023-07-18 9:30 ` [PULL 8/8] tests/avocado: Disable the test_sbsaref_edk2_firmware by default Thomas Huth
2023-07-19 12:40 ` [PULL 0/8] s390x, qtest and misc patches for QEMU 8.1 rc1 Peter Maydell
2023-07-19 15:05 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230718093040.172145-2-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=clg@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).