From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Subject: [RFC PATCH 0/9] Move target configuration to meson
Date: Sun, 20 Sep 2020 09:06:59 -0400 [thread overview]
Message-ID: <20200920130708.1156310-1-pbonzini@redhat.com> (raw)
Next in the "Meson experiments" series, this one moves target
configuration to meson. Actually only the accelerator part
(supported_target etc.) is moved, the TARGET_* part of config-target.mak
files become static. This is more maintainable since the files are
small and change very rarely.
The previous default-configs/ files move to default-configs/devices
(matching config-devices.h) while the previous contents of
config-target.mak now reside in default-configs/targets.
RFC because there are other cleanups that might be worth doing at the
same time, such as removing the gdb-xml/ component of TARGET_XML_FILES,
or using TARGET_ARCH=xtensa instead of TARGET_XTENSA=y. Some might
also prefer to have a single file for e.g. aarch64-linux-user.mak
and aarch64-softmmu.mak (I refrained from doing so because I wasn't
sure if, in the future, bsd-user and linux-user could conflict).
That said, these probably should be done on top of these patches to keep
the initial conversion simple.
Paolo
Paolo Bonzini (9):
default-configs: move files to default-configs/devices/
configure: convert accelerator variables to meson options
configure: rewrite accelerator defaults as tests
configure: move accelerator logic to meson
configure: remove dead variable
configure: move CONFIG_* symbols to meson
configure: remove target configuration
default-configs/targets: remove useless lines
default-configs: remove default-configs/devices for user-mode targets
configure | 540 ++----------------
default-configs/aarch64-linux-user.mak | 1 -
default-configs/aarch64_be-linux-user.mak | 1 -
default-configs/alpha-linux-user.mak | 1 -
default-configs/arm-linux-user.mak | 1 -
default-configs/armeb-linux-user.mak | 1 -
default-configs/cris-linux-user.mak | 1 -
.../{ => devices}/aarch64-softmmu.mak | 0
.../{ => devices}/alpha-softmmu.mak | 0
default-configs/{ => devices}/arm-softmmu.mak | 0
default-configs/{ => devices}/avr-softmmu.mak | 0
.../{ => devices}/cris-softmmu.mak | 0
.../{ => devices}/hppa-softmmu.mak | 0
.../{ => devices}/i386-softmmu.mak | 0
.../{ => devices}/lm32-softmmu.mak | 0
.../{ => devices}/m68k-softmmu.mak | 0
.../{ => devices}/microblaze-softmmu.mak | 0
.../{ => devices}/microblazeel-softmmu.mak | 0
.../{ => devices}/mips-softmmu-common.mak | 0
.../{ => devices}/mips-softmmu.mak | 0
.../{ => devices}/mips64-softmmu.mak | 0
.../{ => devices}/mips64el-softmmu.mak | 0
.../{ => devices}/mipsel-softmmu.mak | 0
.../{ => devices}/moxie-softmmu.mak | 0
.../{ => devices}/nios2-softmmu.mak | 0
.../{ => devices}/or1k-softmmu.mak | 0
default-configs/{ => devices}/ppc-softmmu.mak | 0
.../{ => devices}/ppc64-softmmu.mak | 0
.../{ => devices}/riscv32-softmmu.mak | 0
.../{ => devices}/riscv64-softmmu.mak | 0
default-configs/{ => devices}/rx-softmmu.mak | 0
.../{ => devices}/s390x-softmmu.mak | 0
default-configs/{ => devices}/sh4-softmmu.mak | 0
.../{ => devices}/sh4eb-softmmu.mak | 0
.../{ => devices}/sparc-softmmu.mak | 0
.../{ => devices}/sparc64-softmmu.mak | 0
.../{ => devices}/tricore-softmmu.mak | 0
.../{ => devices}/unicore32-softmmu.mak | 0
.../{ => devices}/x86_64-softmmu.mak | 0
.../{ => devices}/xtensa-softmmu.mak | 0
.../{ => devices}/xtensaeb-softmmu.mak | 0
default-configs/hppa-linux-user.mak | 1 -
default-configs/i386-bsd-user.mak | 1 -
default-configs/i386-linux-user.mak | 1 -
default-configs/m68k-linux-user.mak | 1 -
default-configs/microblaze-linux-user.mak | 1 -
default-configs/microblazeel-linux-user.mak | 1 -
default-configs/mips-linux-user.mak | 1 -
default-configs/mips64-linux-user.mak | 1 -
default-configs/mips64el-linux-user.mak | 1 -
default-configs/mipsel-linux-user.mak | 1 -
default-configs/mipsn32-linux-user.mak | 1 -
default-configs/mipsn32el-linux-user.mak | 1 -
default-configs/nios2-linux-user.mak | 1 -
default-configs/or1k-linux-user.mak | 1 -
default-configs/ppc-linux-user.mak | 1 -
default-configs/ppc64-linux-user.mak | 1 -
default-configs/ppc64abi32-linux-user.mak | 1 -
default-configs/ppc64le-linux-user.mak | 1 -
default-configs/riscv32-linux-user.mak | 1 -
default-configs/riscv64-linux-user.mak | 1 -
default-configs/s390x-linux-user.mak | 1 -
default-configs/sh4-linux-user.mak | 1 -
default-configs/sh4eb-linux-user.mak | 1 -
default-configs/sparc-bsd-user.mak | 1 -
default-configs/sparc-linux-user.mak | 1 -
default-configs/sparc32plus-linux-user.mak | 1 -
default-configs/sparc64-bsd-user.mak | 1 -
default-configs/sparc64-linux-user.mak | 1 -
.../targets/aarch64-linux-user.mak | 5 +
default-configs/targets/aarch64-softmmu.mak | 4 +
.../targets/aarch64_be-linux-user.mak | 6 +
default-configs/targets/alpha-linux-user.mak | 6 +
default-configs/targets/alpha-softmmu.mak | 4 +
default-configs/targets/arm-linux-user.mak | 7 +
default-configs/targets/arm-softmmu.mak | 4 +
default-configs/targets/armeb-linux-user.mak | 8 +
default-configs/targets/avr-softmmu.mak | 3 +
default-configs/targets/cris-linux-user.mak | 3 +
default-configs/targets/cris-softmmu.mak | 2 +
default-configs/targets/hppa-linux-user.mak | 7 +
default-configs/targets/hppa-softmmu.mak | 5 +
default-configs/targets/i386-bsd-user.mak | 4 +
default-configs/targets/i386-linux-user.mak | 6 +
default-configs/targets/i386-softmmu.mak | 4 +
default-configs/targets/lm32-softmmu.mak | 3 +
default-configs/targets/m68k-linux-user.mak | 8 +
default-configs/targets/m68k-softmmu.mak | 4 +
.../targets/microblaze-linux-user.mak | 7 +
.../targets/microblaze-softmmu.mak | 4 +
.../targets/microblazeel-linux-user.mak | 6 +
.../targets/microblazeel-softmmu.mak | 3 +
default-configs/targets/mips-linux-user.mak | 8 +
default-configs/targets/mips-softmmu.mak | 6 +
default-configs/targets/mips64-linux-user.mak | 8 +
default-configs/targets/mips64-softmmu.mak | 5 +
.../targets/mips64el-linux-user.mak | 7 +
default-configs/targets/mips64el-softmmu.mak | 4 +
default-configs/targets/mipsel-linux-user.mak | 7 +
default-configs/targets/mipsel-softmmu.mak | 5 +
.../targets/mipsn32-linux-user.mak | 9 +
.../targets/mipsn32el-linux-user.mak | 8 +
default-configs/targets/moxie-softmmu.mak | 3 +
default-configs/targets/nios2-linux-user.mak | 3 +
default-configs/targets/nios2-softmmu.mak | 2 +
default-configs/targets/or1k-linux-user.mak | 4 +
default-configs/targets/or1k-softmmu.mak | 3 +
default-configs/targets/ppc-linux-user.mak | 7 +
default-configs/targets/ppc-softmmu.mak | 4 +
default-configs/targets/ppc64-linux-user.mak | 7 +
default-configs/targets/ppc64-softmmu.mak | 5 +
.../targets/ppc64abi32-linux-user.mak | 8 +
.../targets/ppc64le-linux-user.mak | 6 +
.../targets/riscv32-linux-user.mak | 4 +
default-configs/targets/riscv32-softmmu.mak | 4 +
.../targets/riscv64-linux-user.mak | 4 +
default-configs/targets/riscv64-softmmu.mak | 4 +
default-configs/targets/rx-softmmu.mak | 3 +
default-configs/targets/s390x-linux-user.mak | 7 +
default-configs/targets/s390x-softmmu.mak | 5 +
default-configs/targets/sh4-linux-user.mak | 7 +
default-configs/targets/sh4-softmmu.mak | 3 +
default-configs/targets/sh4eb-linux-user.mak | 8 +
default-configs/targets/sh4eb-softmmu.mak | 4 +
default-configs/targets/sparc-bsd-user.mak | 5 +
default-configs/targets/sparc-linux-user.mak | 7 +
default-configs/targets/sparc-softmmu.mak | 4 +
.../targets/sparc32plus-linux-user.mak | 8 +
default-configs/targets/sparc64-bsd-user.mak | 5 +
.../targets/sparc64-linux-user.mak | 7 +
default-configs/targets/sparc64-softmmu.mak | 4 +
default-configs/targets/tilegx-linux-user.mak | 3 +
default-configs/targets/tricore-softmmu.mak | 2 +
default-configs/targets/unicore32-softmmu.mak | 2 +
default-configs/targets/x86_64-bsd-user.mak | 4 +
default-configs/targets/x86_64-linux-user.mak | 6 +
default-configs/targets/x86_64-softmmu.mak | 4 +
default-configs/targets/xtensa-linux-user.mak | 7 +
default-configs/targets/xtensa-softmmu.mak | 4 +
.../targets/xtensaeb-linux-user.mak | 8 +
default-configs/targets/xtensaeb-softmmu.mak | 5 +
default-configs/tilegx-linux-user.mak | 1 -
default-configs/x86_64-bsd-user.mak | 1 -
default-configs/x86_64-linux-user.mak | 1 -
default-configs/xtensa-linux-user.mak | 1 -
default-configs/xtensaeb-linux-user.mak | 1 -
meson.build | 154 ++++-
meson_options.txt | 15 +
148 files changed, 582 insertions(+), 536 deletions(-)
delete mode 100644 default-configs/aarch64-linux-user.mak
delete mode 100644 default-configs/aarch64_be-linux-user.mak
delete mode 100644 default-configs/alpha-linux-user.mak
delete mode 100644 default-configs/arm-linux-user.mak
delete mode 100644 default-configs/armeb-linux-user.mak
delete mode 100644 default-configs/cris-linux-user.mak
rename default-configs/{ => devices}/aarch64-softmmu.mak (100%)
rename default-configs/{ => devices}/alpha-softmmu.mak (100%)
rename default-configs/{ => devices}/arm-softmmu.mak (100%)
rename default-configs/{ => devices}/avr-softmmu.mak (100%)
rename default-configs/{ => devices}/cris-softmmu.mak (100%)
rename default-configs/{ => devices}/hppa-softmmu.mak (100%)
rename default-configs/{ => devices}/i386-softmmu.mak (100%)
rename default-configs/{ => devices}/lm32-softmmu.mak (100%)
rename default-configs/{ => devices}/m68k-softmmu.mak (100%)
rename default-configs/{ => devices}/microblaze-softmmu.mak (100%)
rename default-configs/{ => devices}/microblazeel-softmmu.mak (100%)
rename default-configs/{ => devices}/mips-softmmu-common.mak (100%)
rename default-configs/{ => devices}/mips-softmmu.mak (100%)
rename default-configs/{ => devices}/mips64-softmmu.mak (100%)
rename default-configs/{ => devices}/mips64el-softmmu.mak (100%)
rename default-configs/{ => devices}/mipsel-softmmu.mak (100%)
rename default-configs/{ => devices}/moxie-softmmu.mak (100%)
rename default-configs/{ => devices}/nios2-softmmu.mak (100%)
rename default-configs/{ => devices}/or1k-softmmu.mak (100%)
rename default-configs/{ => devices}/ppc-softmmu.mak (100%)
rename default-configs/{ => devices}/ppc64-softmmu.mak (100%)
rename default-configs/{ => devices}/riscv32-softmmu.mak (100%)
rename default-configs/{ => devices}/riscv64-softmmu.mak (100%)
rename default-configs/{ => devices}/rx-softmmu.mak (100%)
rename default-configs/{ => devices}/s390x-softmmu.mak (100%)
rename default-configs/{ => devices}/sh4-softmmu.mak (100%)
rename default-configs/{ => devices}/sh4eb-softmmu.mak (100%)
rename default-configs/{ => devices}/sparc-softmmu.mak (100%)
rename default-configs/{ => devices}/sparc64-softmmu.mak (100%)
rename default-configs/{ => devices}/tricore-softmmu.mak (100%)
rename default-configs/{ => devices}/unicore32-softmmu.mak (100%)
rename default-configs/{ => devices}/x86_64-softmmu.mak (100%)
rename default-configs/{ => devices}/xtensa-softmmu.mak (100%)
rename default-configs/{ => devices}/xtensaeb-softmmu.mak (100%)
delete mode 100644 default-configs/hppa-linux-user.mak
delete mode 100644 default-configs/i386-bsd-user.mak
delete mode 100644 default-configs/i386-linux-user.mak
delete mode 100644 default-configs/m68k-linux-user.mak
delete mode 100644 default-configs/microblaze-linux-user.mak
delete mode 100644 default-configs/microblazeel-linux-user.mak
delete mode 100644 default-configs/mips-linux-user.mak
delete mode 100644 default-configs/mips64-linux-user.mak
delete mode 100644 default-configs/mips64el-linux-user.mak
delete mode 100644 default-configs/mipsel-linux-user.mak
delete mode 100644 default-configs/mipsn32-linux-user.mak
delete mode 100644 default-configs/mipsn32el-linux-user.mak
delete mode 100644 default-configs/nios2-linux-user.mak
delete mode 100644 default-configs/or1k-linux-user.mak
delete mode 100644 default-configs/ppc-linux-user.mak
delete mode 100644 default-configs/ppc64-linux-user.mak
delete mode 100644 default-configs/ppc64abi32-linux-user.mak
delete mode 100644 default-configs/ppc64le-linux-user.mak
delete mode 100644 default-configs/riscv32-linux-user.mak
delete mode 100644 default-configs/riscv64-linux-user.mak
delete mode 100644 default-configs/s390x-linux-user.mak
delete mode 100644 default-configs/sh4-linux-user.mak
delete mode 100644 default-configs/sh4eb-linux-user.mak
delete mode 100644 default-configs/sparc-bsd-user.mak
delete mode 100644 default-configs/sparc-linux-user.mak
delete mode 100644 default-configs/sparc32plus-linux-user.mak
delete mode 100644 default-configs/sparc64-bsd-user.mak
delete mode 100644 default-configs/sparc64-linux-user.mak
create mode 100644 default-configs/targets/aarch64-linux-user.mak
create mode 100644 default-configs/targets/aarch64-softmmu.mak
create mode 100644 default-configs/targets/aarch64_be-linux-user.mak
create mode 100644 default-configs/targets/alpha-linux-user.mak
create mode 100644 default-configs/targets/alpha-softmmu.mak
create mode 100644 default-configs/targets/arm-linux-user.mak
create mode 100644 default-configs/targets/arm-softmmu.mak
create mode 100644 default-configs/targets/armeb-linux-user.mak
create mode 100644 default-configs/targets/avr-softmmu.mak
create mode 100644 default-configs/targets/cris-linux-user.mak
create mode 100644 default-configs/targets/cris-softmmu.mak
create mode 100644 default-configs/targets/hppa-linux-user.mak
create mode 100644 default-configs/targets/hppa-softmmu.mak
create mode 100644 default-configs/targets/i386-bsd-user.mak
create mode 100644 default-configs/targets/i386-linux-user.mak
create mode 100644 default-configs/targets/i386-softmmu.mak
create mode 100644 default-configs/targets/lm32-softmmu.mak
create mode 100644 default-configs/targets/m68k-linux-user.mak
create mode 100644 default-configs/targets/m68k-softmmu.mak
create mode 100644 default-configs/targets/microblaze-linux-user.mak
create mode 100644 default-configs/targets/microblaze-softmmu.mak
create mode 100644 default-configs/targets/microblazeel-linux-user.mak
create mode 100644 default-configs/targets/microblazeel-softmmu.mak
create mode 100644 default-configs/targets/mips-linux-user.mak
create mode 100644 default-configs/targets/mips-softmmu.mak
create mode 100644 default-configs/targets/mips64-linux-user.mak
create mode 100644 default-configs/targets/mips64-softmmu.mak
create mode 100644 default-configs/targets/mips64el-linux-user.mak
create mode 100644 default-configs/targets/mips64el-softmmu.mak
create mode 100644 default-configs/targets/mipsel-linux-user.mak
create mode 100644 default-configs/targets/mipsel-softmmu.mak
create mode 100644 default-configs/targets/mipsn32-linux-user.mak
create mode 100644 default-configs/targets/mipsn32el-linux-user.mak
create mode 100644 default-configs/targets/moxie-softmmu.mak
create mode 100644 default-configs/targets/nios2-linux-user.mak
create mode 100644 default-configs/targets/nios2-softmmu.mak
create mode 100644 default-configs/targets/or1k-linux-user.mak
create mode 100644 default-configs/targets/or1k-softmmu.mak
create mode 100644 default-configs/targets/ppc-linux-user.mak
create mode 100644 default-configs/targets/ppc-softmmu.mak
create mode 100644 default-configs/targets/ppc64-linux-user.mak
create mode 100644 default-configs/targets/ppc64-softmmu.mak
create mode 100644 default-configs/targets/ppc64abi32-linux-user.mak
create mode 100644 default-configs/targets/ppc64le-linux-user.mak
create mode 100644 default-configs/targets/riscv32-linux-user.mak
create mode 100644 default-configs/targets/riscv32-softmmu.mak
create mode 100644 default-configs/targets/riscv64-linux-user.mak
create mode 100644 default-configs/targets/riscv64-softmmu.mak
create mode 100644 default-configs/targets/rx-softmmu.mak
create mode 100644 default-configs/targets/s390x-linux-user.mak
create mode 100644 default-configs/targets/s390x-softmmu.mak
create mode 100644 default-configs/targets/sh4-linux-user.mak
create mode 100644 default-configs/targets/sh4-softmmu.mak
create mode 100644 default-configs/targets/sh4eb-linux-user.mak
create mode 100644 default-configs/targets/sh4eb-softmmu.mak
create mode 100644 default-configs/targets/sparc-bsd-user.mak
create mode 100644 default-configs/targets/sparc-linux-user.mak
create mode 100644 default-configs/targets/sparc-softmmu.mak
create mode 100644 default-configs/targets/sparc32plus-linux-user.mak
create mode 100644 default-configs/targets/sparc64-bsd-user.mak
create mode 100644 default-configs/targets/sparc64-linux-user.mak
create mode 100644 default-configs/targets/sparc64-softmmu.mak
create mode 100644 default-configs/targets/tilegx-linux-user.mak
create mode 100644 default-configs/targets/tricore-softmmu.mak
create mode 100644 default-configs/targets/unicore32-softmmu.mak
create mode 100644 default-configs/targets/x86_64-bsd-user.mak
create mode 100644 default-configs/targets/x86_64-linux-user.mak
create mode 100644 default-configs/targets/x86_64-softmmu.mak
create mode 100644 default-configs/targets/xtensa-linux-user.mak
create mode 100644 default-configs/targets/xtensa-softmmu.mak
create mode 100644 default-configs/targets/xtensaeb-linux-user.mak
create mode 100644 default-configs/targets/xtensaeb-softmmu.mak
delete mode 100644 default-configs/tilegx-linux-user.mak
delete mode 100644 default-configs/x86_64-bsd-user.mak
delete mode 100644 default-configs/x86_64-linux-user.mak
delete mode 100644 default-configs/xtensa-linux-user.mak
delete mode 100644 default-configs/xtensaeb-linux-user.mak
--
2.26.2
next reply other threads:[~2020-09-20 13:12 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-20 13:06 Paolo Bonzini [this message]
2020-09-20 13:07 ` [PATCH 1/9] default-configs: move files to default-configs/devices/ Paolo Bonzini
2020-09-20 23:56 ` Richard Henderson
2020-09-20 13:07 ` [PATCH 2/9] configure: convert accelerator variables to meson options Paolo Bonzini
2020-09-21 0:04 ` Richard Henderson
2020-09-20 13:07 ` [PATCH 3/9] configure: rewrite accelerator defaults as tests Paolo Bonzini
2020-09-21 0:06 ` Richard Henderson
2020-09-20 13:07 ` [PATCH 4/9] configure: move accelerator logic to meson Paolo Bonzini
2020-09-21 0:17 ` Richard Henderson
2020-09-20 13:07 ` [PATCH 5/9] configure: remove dead variable Paolo Bonzini
2020-09-21 0:17 ` Richard Henderson
2020-09-20 13:07 ` [PATCH 6/9] configure: move CONFIG_* symbols to meson Paolo Bonzini
2020-09-21 0:20 ` Richard Henderson
2020-09-20 13:07 ` [PATCH 7/9] configure: remove target configuration Paolo Bonzini
2020-09-20 13:13 ` 罗勇刚(Yonggang Luo)
2020-09-20 16:44 ` Paolo Bonzini
2020-09-20 13:07 ` [PATCH 8/9] default-configs/targets: remove useless lines Paolo Bonzini
2020-09-21 0:29 ` Richard Henderson
2020-09-21 7:50 ` Paolo Bonzini
2020-09-20 13:07 ` [PATCH 9/9] default-configs: remove default-configs/devices for user-mode targets Paolo Bonzini
2020-09-21 0:30 ` 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=20200920130708.1156310-1-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 NNTP newsgroup(s).