From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Subject: [PULL 22/46] s390x: switch boards to "default y"
Date: Mon, 6 May 2024 09:51:01 +0200 [thread overview]
Message-ID: <20240506075125.8238-23-pbonzini@redhat.com> (raw)
In-Reply-To: <20240506075125.8238-1-pbonzini@redhat.com>
Some targets use "default y" for boards to filter out those that require
TCG. For consistency we are switching all other targets to do the same.
Continue with s390.
No changes to generated config-devices.mak file.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configs/devices/s390x-softmmu/default.mak | 5 ++---
.gitlab-ci.d/buildtest.yml | 4 ++--
hw/s390x/Kconfig | 2 ++
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/configs/devices/s390x-softmmu/default.mak b/configs/devices/s390x-softmmu/default.mak
index 6d87bc8b4b0..340c1092922 100644
--- a/configs/devices/s390x-softmmu/default.mak
+++ b/configs/devices/s390x-softmmu/default.mak
@@ -9,6 +9,5 @@
#CONFIG_WDT_DIAG288=n
#CONFIG_PCIE_DEVICES=n
-# Boards:
-#
-CONFIG_S390_CCW_VIRTIO=y
+# Boards are selected by default, uncomment to keep out of the build.
+# CONFIG_S390_CCW_VIRTIO=n
diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml
index 13f505f20d7..2475262c5c8 100644
--- a/.gitlab-ci.d/buildtest.yml
+++ b/.gitlab-ci.d/buildtest.yml
@@ -650,7 +650,7 @@ build-tci:
# Check our reduced build configurations
# requires libfdt: aarch64, arm, i386, loongarch64, microblaze, microblazeel,
# mips64el, or1k, ppc, ppc64, riscv32, riscv64, rx, x86_64
-# does not build without boards: i386, loongarch64, x86_64
+# does not build without boards: i386, loongarch64, s390x, x86_64
build-without-defaults:
extends: .native_build_job_template
needs:
@@ -666,7 +666,7 @@ build-without-defaults:
--disable-strip
TARGETS: alpha-softmmu avr-softmmu cris-softmmu hppa-softmmu m68k-softmmu
mips-softmmu mips64-softmmu mipsel-softmmu
- s390x-softmmu sh4-softmmu
+ sh4-softmmu
sparc64-softmmu hexagon-linux-user i386-linux-user s390x-linux-user
MAKE_CHECK_ARGS: check
diff --git a/hw/s390x/Kconfig b/hw/s390x/Kconfig
index 26ad1044858..3bbf4ae56e4 100644
--- a/hw/s390x/Kconfig
+++ b/hw/s390x/Kconfig
@@ -1,5 +1,7 @@
config S390_CCW_VIRTIO
bool
+ default y
+ depends on S390X
imply VIRTIO_PCI
imply TERMINAL3270
imply VFIO_AP
--
2.44.0
next prev parent reply other threads:[~2024-05-06 7:56 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-06 7:50 [PULL 00/46] Mostly build system and other cleanups patches for 2024-05-06 Paolo Bonzini
2024-05-06 7:50 ` [PULL 01/46] target/i386: Give IRQs a chance when resetting HF_INHIBIT_IRQ_MASK Paolo Bonzini
2024-05-06 7:50 ` [PULL 02/46] Kconfig: kvm: allow building without any board Paolo Bonzini
2024-05-06 7:50 ` [PULL 03/46] tests/qtest: skip m48t59-test if the machine is absent Paolo Bonzini
2024-05-06 7:50 ` [PULL 04/46] gitlab-ci: adjust msys2-64bit to be able to run qtest Paolo Bonzini
2024-05-06 7:50 ` [PULL 05/46] kvm: ppc: disable sPAPR code if CONFIG_PSERIES is disabled Paolo Bonzini
2024-05-06 7:50 ` [PULL 06/46] configs: list "implied" device groups in the default configs Paolo Bonzini
2024-05-06 7:50 ` [PULL 07/46] alpha: switch boards to "default y" Paolo Bonzini
2024-05-06 7:50 ` [PULL 08/46] arm: " Paolo Bonzini
2024-05-06 7:50 ` [PULL 09/46] avr: " Paolo Bonzini
2024-05-06 7:50 ` [PULL 10/46] cris: " Paolo Bonzini
2024-05-06 7:50 ` [PULL 11/46] hppa: " Paolo Bonzini
2024-05-06 7:50 ` [PULL 12/46] i386: " Paolo Bonzini
2024-05-06 7:50 ` [PULL 13/46] loongarch: " Paolo Bonzini
2024-05-06 7:50 ` [PULL 14/46] m68k: " Paolo Bonzini
2024-05-06 7:50 ` [PULL 15/46] microblaze: " Paolo Bonzini
2024-05-06 7:50 ` [PULL 16/46] meson: make target endianneess available to Kconfig Paolo Bonzini
2024-05-06 7:50 ` [PULL 17/46] mips: switch boards to "default y" Paolo Bonzini
2024-05-06 7:50 ` [PULL 18/46] openrisc: " Paolo Bonzini
2024-05-06 7:50 ` [PULL 19/46] ppc: " Paolo Bonzini
2024-05-06 7:50 ` [PULL 20/46] riscv: " Paolo Bonzini
2024-05-06 7:51 ` [PULL 21/46] rx: " Paolo Bonzini
2024-05-06 7:51 ` Paolo Bonzini [this message]
2024-05-06 7:51 ` [PULL 23/46] sh4: " Paolo Bonzini
2024-05-06 7:51 ` [PULL 24/46] sparc: " Paolo Bonzini
2024-05-06 7:51 ` [PULL 25/46] tricore: " Paolo Bonzini
2024-05-06 7:51 ` [PULL 26/46] xtensa: " Paolo Bonzini
2024-05-06 7:51 ` [PULL 27/46] docs: document new convention for Kconfig board symbols Paolo Bonzini
2024-05-06 7:51 ` [PULL 28/46] target/i386: Introduce SapphireRapids-v3 to add missing features Paolo Bonzini
2024-05-06 7:51 ` [PULL 29/46] bitmap: Use g_try_new0/g_new0/g_renew Paolo Bonzini
2024-05-06 7:51 ` [PULL 30/46] build: do not build virtio-vga-gl if virgl/opengl not available Paolo Bonzini
2024-05-06 7:51 ` [PULL 31/46] fw_cfg: remove useless declarations from typedefs.h Paolo Bonzini
2024-05-06 7:51 ` [PULL 32/46] qdev-core: remove DeviceListener " Paolo Bonzini
2024-05-06 7:51 ` [PULL 33/46] numa: remove types " Paolo Bonzini
2024-05-06 7:51 ` [PULL 34/46] net: remove AnnounceTimer " Paolo Bonzini
2024-05-06 7:51 ` [PULL 35/46] qemu-option: remove QemuOpt " Paolo Bonzini
2024-05-06 7:51 ` [PULL 36/46] intc: remove PICCommonState " Paolo Bonzini
2024-05-06 7:51 ` [PULL 37/46] lockable: remove QemuLockable " Paolo Bonzini
2024-05-06 7:51 ` [PULL 38/46] migration: remove PostcopyDiscardState " Paolo Bonzini
2024-05-06 7:51 ` [PULL 39/46] monitor: remove MonitorDef " Paolo Bonzini
2024-05-06 7:51 ` [PULL 40/46] qapi/machine: remove types " Paolo Bonzini
2024-05-06 7:51 ` [PULL 41/46] display: remove GraphicHwOps " Paolo Bonzini
2024-05-06 7:51 ` [PULL 42/46] tcg: remove CPU* types " Paolo Bonzini
2024-05-06 7:51 ` [PULL 43/46] pci: remove some " Paolo Bonzini
2024-05-06 7:51 ` [PULL 44/46] kvm: move target-dependent interrupt routing out of kvm-all.c Paolo Bonzini
2024-05-06 7:51 ` [PULL 45/46] migration: do not include coroutine_int.h Paolo Bonzini
2024-05-06 7:51 ` [PULL 46/46] qga/commands-posix: fix typo in qmp_guest_set_user_password Paolo Bonzini
2024-05-06 17:17 ` [PULL 00/46] Mostly build system and other cleanups patches for 2024-05-06 Richard Henderson
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=20240506075125.8238-23-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.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 read-only IMAP folder(s) and NNTP newsgroup(s).