From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: richard.henderson@linaro.org
Subject: [PATCH 09/12] default-configs: remove default-configs/devices for user-mode targets
Date: Wed, 23 Sep 2020 05:11:28 -0400 [thread overview]
Message-ID: <20200923091131.1591563-10-pbonzini@redhat.com> (raw)
In-Reply-To: <20200923091131.1591563-1-pbonzini@redhat.com>
We no longer need dummy files to detect targets, since
default-configs/targets/ exists.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
configure | 6 +++---
default-configs/devices/aarch64-linux-user.mak | 1 -
default-configs/devices/aarch64_be-linux-user.mak | 1 -
default-configs/devices/alpha-linux-user.mak | 1 -
default-configs/devices/arm-linux-user.mak | 1 -
default-configs/devices/armeb-linux-user.mak | 1 -
default-configs/devices/cris-linux-user.mak | 1 -
default-configs/devices/hppa-linux-user.mak | 1 -
default-configs/devices/i386-bsd-user.mak | 1 -
default-configs/devices/i386-linux-user.mak | 1 -
default-configs/devices/m68k-linux-user.mak | 1 -
default-configs/devices/microblaze-linux-user.mak | 1 -
default-configs/devices/microblazeel-linux-user.mak | 1 -
default-configs/devices/mips-linux-user.mak | 1 -
default-configs/devices/mips64-linux-user.mak | 1 -
default-configs/devices/mips64el-linux-user.mak | 1 -
default-configs/devices/mipsel-linux-user.mak | 1 -
default-configs/devices/mipsn32-linux-user.mak | 1 -
default-configs/devices/mipsn32el-linux-user.mak | 1 -
default-configs/devices/nios2-linux-user.mak | 1 -
default-configs/devices/or1k-linux-user.mak | 1 -
default-configs/devices/ppc-linux-user.mak | 1 -
default-configs/devices/ppc64-linux-user.mak | 1 -
default-configs/devices/ppc64abi32-linux-user.mak | 1 -
default-configs/devices/ppc64le-linux-user.mak | 1 -
default-configs/devices/riscv32-linux-user.mak | 1 -
default-configs/devices/riscv64-linux-user.mak | 1 -
default-configs/devices/s390x-linux-user.mak | 1 -
default-configs/devices/sh4-linux-user.mak | 1 -
default-configs/devices/sh4eb-linux-user.mak | 1 -
default-configs/devices/sparc-bsd-user.mak | 1 -
default-configs/devices/sparc-linux-user.mak | 1 -
default-configs/devices/sparc32plus-linux-user.mak | 1 -
default-configs/devices/sparc64-bsd-user.mak | 1 -
default-configs/devices/sparc64-linux-user.mak | 1 -
default-configs/devices/tilegx-linux-user.mak | 1 -
default-configs/devices/x86_64-bsd-user.mak | 1 -
default-configs/devices/x86_64-linux-user.mak | 1 -
default-configs/devices/xtensa-linux-user.mak | 1 -
default-configs/devices/xtensaeb-linux-user.mak | 1 -
40 files changed, 3 insertions(+), 42 deletions(-)
delete mode 100644 default-configs/devices/aarch64-linux-user.mak
delete mode 100644 default-configs/devices/aarch64_be-linux-user.mak
delete mode 100644 default-configs/devices/alpha-linux-user.mak
delete mode 100644 default-configs/devices/arm-linux-user.mak
delete mode 100644 default-configs/devices/armeb-linux-user.mak
delete mode 100644 default-configs/devices/cris-linux-user.mak
delete mode 100644 default-configs/devices/hppa-linux-user.mak
delete mode 100644 default-configs/devices/i386-bsd-user.mak
delete mode 100644 default-configs/devices/i386-linux-user.mak
delete mode 100644 default-configs/devices/m68k-linux-user.mak
delete mode 100644 default-configs/devices/microblaze-linux-user.mak
delete mode 100644 default-configs/devices/microblazeel-linux-user.mak
delete mode 100644 default-configs/devices/mips-linux-user.mak
delete mode 100644 default-configs/devices/mips64-linux-user.mak
delete mode 100644 default-configs/devices/mips64el-linux-user.mak
delete mode 100644 default-configs/devices/mipsel-linux-user.mak
delete mode 100644 default-configs/devices/mipsn32-linux-user.mak
delete mode 100644 default-configs/devices/mipsn32el-linux-user.mak
delete mode 100644 default-configs/devices/nios2-linux-user.mak
delete mode 100644 default-configs/devices/or1k-linux-user.mak
delete mode 100644 default-configs/devices/ppc-linux-user.mak
delete mode 100644 default-configs/devices/ppc64-linux-user.mak
delete mode 100644 default-configs/devices/ppc64abi32-linux-user.mak
delete mode 100644 default-configs/devices/ppc64le-linux-user.mak
delete mode 100644 default-configs/devices/riscv32-linux-user.mak
delete mode 100644 default-configs/devices/riscv64-linux-user.mak
delete mode 100644 default-configs/devices/s390x-linux-user.mak
delete mode 100644 default-configs/devices/sh4-linux-user.mak
delete mode 100644 default-configs/devices/sh4eb-linux-user.mak
delete mode 100644 default-configs/devices/sparc-bsd-user.mak
delete mode 100644 default-configs/devices/sparc-linux-user.mak
delete mode 100644 default-configs/devices/sparc32plus-linux-user.mak
delete mode 100644 default-configs/devices/sparc64-bsd-user.mak
delete mode 100644 default-configs/devices/sparc64-linux-user.mak
delete mode 100644 default-configs/devices/tilegx-linux-user.mak
delete mode 100644 default-configs/devices/x86_64-bsd-user.mak
delete mode 100644 default-configs/devices/x86_64-linux-user.mak
delete mode 100644 default-configs/devices/xtensa-linux-user.mak
delete mode 100644 default-configs/devices/xtensaeb-linux-user.mak
diff --git a/configure b/configure
index 7cff5c0b7a..6e60de3e07 100755
--- a/configure
+++ b/configure
@@ -1608,13 +1608,13 @@ deprecated_features=""
mak_wilds=""
if [ "$softmmu" = "yes" ]; then
- mak_wilds="${mak_wilds} $source_path/default-configs/devices/*-softmmu.mak"
+ mak_wilds="${mak_wilds} $source_path/default-configs/targets/*-softmmu.mak"
fi
if [ "$linux_user" = "yes" ]; then
- mak_wilds="${mak_wilds} $source_path/default-configs/devices/*-linux-user.mak"
+ mak_wilds="${mak_wilds} $source_path/default-configs/targets/*-linux-user.mak"
fi
if [ "$bsd_user" = "yes" ]; then
- mak_wilds="${mak_wilds} $source_path/default-configs/devices/*-bsd-user.mak"
+ mak_wilds="${mak_wilds} $source_path/default-configs/targets/*-bsd-user.mak"
fi
# If the user doesn't explicitly specify a deprecated target we will
diff --git a/default-configs/devices/aarch64-linux-user.mak b/default-configs/devices/aarch64-linux-user.mak
deleted file mode 100644
index 0a5b08a007..0000000000
--- a/default-configs/devices/aarch64-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for aarch64-linux-user
diff --git a/default-configs/devices/aarch64_be-linux-user.mak b/default-configs/devices/aarch64_be-linux-user.mak
deleted file mode 100644
index a69d9d2e41..0000000000
--- a/default-configs/devices/aarch64_be-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for aarch64_be-linux-user
diff --git a/default-configs/devices/alpha-linux-user.mak b/default-configs/devices/alpha-linux-user.mak
deleted file mode 100644
index 7956e29898..0000000000
--- a/default-configs/devices/alpha-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for alpha-linux-user
diff --git a/default-configs/devices/arm-linux-user.mak b/default-configs/devices/arm-linux-user.mak
deleted file mode 100644
index 413361a022..0000000000
--- a/default-configs/devices/arm-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for arm-linux-user
diff --git a/default-configs/devices/armeb-linux-user.mak b/default-configs/devices/armeb-linux-user.mak
deleted file mode 100644
index bf2ffe7038..0000000000
--- a/default-configs/devices/armeb-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for armeb-linux-user
diff --git a/default-configs/devices/cris-linux-user.mak b/default-configs/devices/cris-linux-user.mak
deleted file mode 100644
index e3aec7b864..0000000000
--- a/default-configs/devices/cris-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for cris-linux-user
diff --git a/default-configs/devices/hppa-linux-user.mak b/default-configs/devices/hppa-linux-user.mak
deleted file mode 100644
index 796393940b..0000000000
--- a/default-configs/devices/hppa-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for hppa-linux-user
diff --git a/default-configs/devices/i386-bsd-user.mak b/default-configs/devices/i386-bsd-user.mak
deleted file mode 100644
index af1b31a59a..0000000000
--- a/default-configs/devices/i386-bsd-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for i386-bsd-user
diff --git a/default-configs/devices/i386-linux-user.mak b/default-configs/devices/i386-linux-user.mak
deleted file mode 100644
index 8657e68627..0000000000
--- a/default-configs/devices/i386-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for i386-linux-user
diff --git a/default-configs/devices/m68k-linux-user.mak b/default-configs/devices/m68k-linux-user.mak
deleted file mode 100644
index 06cd5ed7ed..0000000000
--- a/default-configs/devices/m68k-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for m68k-linux-user
diff --git a/default-configs/devices/microblaze-linux-user.mak b/default-configs/devices/microblaze-linux-user.mak
deleted file mode 100644
index 566fdc01c4..0000000000
--- a/default-configs/devices/microblaze-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for microblaze-linux-user
diff --git a/default-configs/devices/microblazeel-linux-user.mak b/default-configs/devices/microblazeel-linux-user.mak
deleted file mode 100644
index 378c6ddcb0..0000000000
--- a/default-configs/devices/microblazeel-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for microblazeel-linux-user
diff --git a/default-configs/devices/mips-linux-user.mak b/default-configs/devices/mips-linux-user.mak
deleted file mode 100644
index 31df57021e..0000000000
--- a/default-configs/devices/mips-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for mips-linux-user
diff --git a/default-configs/devices/mips64-linux-user.mak b/default-configs/devices/mips64-linux-user.mak
deleted file mode 100644
index 1598bfcf7d..0000000000
--- a/default-configs/devices/mips64-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for mips64-linux-user
diff --git a/default-configs/devices/mips64el-linux-user.mak b/default-configs/devices/mips64el-linux-user.mak
deleted file mode 100644
index 629f084086..0000000000
--- a/default-configs/devices/mips64el-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for mips64el-linux-user
diff --git a/default-configs/devices/mipsel-linux-user.mak b/default-configs/devices/mipsel-linux-user.mak
deleted file mode 100644
index 4d0e4afb69..0000000000
--- a/default-configs/devices/mipsel-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for mipsel-linux-user
diff --git a/default-configs/devices/mipsn32-linux-user.mak b/default-configs/devices/mipsn32-linux-user.mak
deleted file mode 100644
index 5b97919794..0000000000
--- a/default-configs/devices/mipsn32-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for mipsn32-linux-user
diff --git a/default-configs/devices/mipsn32el-linux-user.mak b/default-configs/devices/mipsn32el-linux-user.mak
deleted file mode 100644
index d6367ff987..0000000000
--- a/default-configs/devices/mipsn32el-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for mipsn32el-linux-user
diff --git a/default-configs/devices/nios2-linux-user.mak b/default-configs/devices/nios2-linux-user.mak
deleted file mode 100644
index 5be3eb795d..0000000000
--- a/default-configs/devices/nios2-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for nios2-linux-user
diff --git a/default-configs/devices/or1k-linux-user.mak b/default-configs/devices/or1k-linux-user.mak
deleted file mode 100644
index 20e03c1317..0000000000
--- a/default-configs/devices/or1k-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for or1k-linux-user
diff --git a/default-configs/devices/ppc-linux-user.mak b/default-configs/devices/ppc-linux-user.mak
deleted file mode 100644
index 6273df2930..0000000000
--- a/default-configs/devices/ppc-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for ppc-linux-user
diff --git a/default-configs/devices/ppc64-linux-user.mak b/default-configs/devices/ppc64-linux-user.mak
deleted file mode 100644
index 422d3fbaeb..0000000000
--- a/default-configs/devices/ppc64-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for ppc64-linux-user
diff --git a/default-configs/devices/ppc64abi32-linux-user.mak b/default-configs/devices/ppc64abi32-linux-user.mak
deleted file mode 100644
index 1c657ec9bb..0000000000
--- a/default-configs/devices/ppc64abi32-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for ppc64abi32-linux-user
diff --git a/default-configs/devices/ppc64le-linux-user.mak b/default-configs/devices/ppc64le-linux-user.mak
deleted file mode 100644
index 63f4269023..0000000000
--- a/default-configs/devices/ppc64le-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for ppc64le-linux-user
diff --git a/default-configs/devices/riscv32-linux-user.mak b/default-configs/devices/riscv32-linux-user.mak
deleted file mode 100644
index 865b362f5a..0000000000
--- a/default-configs/devices/riscv32-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for riscv-linux-user
diff --git a/default-configs/devices/riscv64-linux-user.mak b/default-configs/devices/riscv64-linux-user.mak
deleted file mode 100644
index 865b362f5a..0000000000
--- a/default-configs/devices/riscv64-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for riscv-linux-user
diff --git a/default-configs/devices/s390x-linux-user.mak b/default-configs/devices/s390x-linux-user.mak
deleted file mode 100644
index a243c99874..0000000000
--- a/default-configs/devices/s390x-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for s390x-linux-user
diff --git a/default-configs/devices/sh4-linux-user.mak b/default-configs/devices/sh4-linux-user.mak
deleted file mode 100644
index a469e19ac6..0000000000
--- a/default-configs/devices/sh4-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for sh4-linux-user
diff --git a/default-configs/devices/sh4eb-linux-user.mak b/default-configs/devices/sh4eb-linux-user.mak
deleted file mode 100644
index be08ca1002..0000000000
--- a/default-configs/devices/sh4eb-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for sh4eb-linux-user
diff --git a/default-configs/devices/sparc-bsd-user.mak b/default-configs/devices/sparc-bsd-user.mak
deleted file mode 100644
index 21e09508d8..0000000000
--- a/default-configs/devices/sparc-bsd-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for sparc-bsd-user
diff --git a/default-configs/devices/sparc-linux-user.mak b/default-configs/devices/sparc-linux-user.mak
deleted file mode 100644
index 9c716d1f92..0000000000
--- a/default-configs/devices/sparc-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for sparc-linux-user
diff --git a/default-configs/devices/sparc32plus-linux-user.mak b/default-configs/devices/sparc32plus-linux-user.mak
deleted file mode 100644
index 432e88011e..0000000000
--- a/default-configs/devices/sparc32plus-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for sparc32plus-linux-user
diff --git a/default-configs/devices/sparc64-bsd-user.mak b/default-configs/devices/sparc64-bsd-user.mak
deleted file mode 100644
index b8b9eea7f6..0000000000
--- a/default-configs/devices/sparc64-bsd-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for sparc64-bsd-user
diff --git a/default-configs/devices/sparc64-linux-user.mak b/default-configs/devices/sparc64-linux-user.mak
deleted file mode 100644
index bf1bdd6aa4..0000000000
--- a/default-configs/devices/sparc64-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for sparc64-linux-user
diff --git a/default-configs/devices/tilegx-linux-user.mak b/default-configs/devices/tilegx-linux-user.mak
deleted file mode 100644
index 3e47493af0..0000000000
--- a/default-configs/devices/tilegx-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for tilegx-linux-user
diff --git a/default-configs/devices/x86_64-bsd-user.mak b/default-configs/devices/x86_64-bsd-user.mak
deleted file mode 100644
index 73e5d34ec5..0000000000
--- a/default-configs/devices/x86_64-bsd-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for x86_64-bsd-user
diff --git a/default-configs/devices/x86_64-linux-user.mak b/default-configs/devices/x86_64-linux-user.mak
deleted file mode 100644
index bec1d9e7c6..0000000000
--- a/default-configs/devices/x86_64-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for x86_64-linux-user
diff --git a/default-configs/devices/xtensa-linux-user.mak b/default-configs/devices/xtensa-linux-user.mak
deleted file mode 100644
index fd1d350ee9..0000000000
--- a/default-configs/devices/xtensa-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for xtensa-linux-user
diff --git a/default-configs/devices/xtensaeb-linux-user.mak b/default-configs/devices/xtensaeb-linux-user.mak
deleted file mode 100644
index fd1d350ee9..0000000000
--- a/default-configs/devices/xtensaeb-linux-user.mak
+++ /dev/null
@@ -1 +0,0 @@
-# Default configuration for xtensa-linux-user
--
2.26.2
next prev parent reply other threads:[~2020-09-23 9:29 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-23 9:11 [PATCH 00/12] Move target configuration to Meson Paolo Bonzini
2020-09-23 9:11 ` [PATCH 01/12] default-configs: move files to default-configs/devices/ Paolo Bonzini
2020-09-23 9:11 ` [PATCH 02/12] configure: convert accelerator variables to meson options Paolo Bonzini
2020-09-23 9:11 ` [PATCH 03/12] configure: rewrite accelerator defaults as tests Paolo Bonzini
2020-09-23 9:11 ` [PATCH 04/12] configure: move accelerator logic to meson Paolo Bonzini
2020-09-23 9:11 ` [PATCH 05/12] configure: remove dead variable Paolo Bonzini
2020-09-23 9:11 ` [PATCH 06/12] configure: compute derivatives of target name in meson Paolo Bonzini
2020-09-23 9:11 ` [PATCH 07/12] configure: remove useless config-target.mak symbols Paolo Bonzini
2020-09-23 9:11 ` [PATCH 08/12] configure: remove target configuration Paolo Bonzini
2020-09-23 9:11 ` Paolo Bonzini [this message]
2020-09-23 9:11 ` [PATCH 10/12] configure: move OpenBSD W^X test to meson Paolo Bonzini
2020-09-23 9:11 ` [PATCH 11/12] default-configs: use TARGET_ARCH key Paolo Bonzini
2020-09-23 9:11 ` [PATCH 12/12] default-configs: remove redundant keys Paolo Bonzini
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=20200923091131.1591563-10-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--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).