From: Andrew Jones <andrew.jones@linux.dev>
To: kvm@vger.kernel.org, kvm-riscv@lists.infradead.org,
kvmarm@lists.linux.dev, linuxppc-dev@lists.ozlabs.org,
linux-s390@vger.kernel.org
Cc: pbonzini@redhat.com, thuth@redhat.com, lvivier@redhat.com,
frankja@linux.ibm.com, imbrenda@linux.ibm.com, nrb@linux.ibm.com,
atishp@rivosinc.com, cade.richard@berkeley.edu,
jamestiotio@gmail.com
Subject: [kvm-unit-tests PATCH 1/2] configure: Introduce add-config
Date: Tue, 3 Sep 2024 16:39:48 +0200 [thread overview]
Message-ID: <20240903143946.834864-5-andrew.jones@linux.dev> (raw)
In-Reply-To: <20240903143946.834864-4-andrew.jones@linux.dev>
Allow users to add additional CONFIG_* and override defaults
by concatenating a given file with #define's and #undef's to
lib/config.h
Signed-off-by: Andrew Jones <andrew.jones@linux.dev>
---
configure | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/configure b/configure
index 27ae9cc89657..7a1317d0650d 100755
--- a/configure
+++ b/configure
@@ -64,6 +64,8 @@ usage() {
no environ is provided by the user (enabled by default)
--erratatxt=FILE specify a file to use instead of errata.txt. Use
'--erratatxt=' to ensure no file is used.
+ --add-config=FILE specify a file containing configs (CONFIG_*) to add on to the
+ generated lib/config.h. Use #undef to override default configs.
--host-key-document=HOST_KEY_DOCUMENT
Specify the machine-specific host-key document for creating
a PVM image with 'genprotimg' (s390x only)
@@ -153,6 +155,10 @@ while [[ "$1" = -* ]]; do
erratatxt=
[ "$arg" ] && erratatxt=$(eval realpath "$arg")
;;
+ --add-config)
+ add_config=
+ [ "$arg" ] && add_config=$(eval realpath "$arg")
+ ;;
--host-key-document)
host_key_document="$arg"
;;
@@ -213,6 +219,10 @@ if [ "$erratatxt" ] && [ ! -f "$erratatxt" ]; then
echo "erratatxt: $erratatxt does not exist or is not a regular file"
exit 1
fi
+if [ "$add_config" ] && [ ! -f "$add_config" ]; then
+ echo "add-config: $add_config does not exist or is not a regular file"
+ exit 1
+fi
arch_name=$arch
[ "$arch" = "aarch64" ] && arch="arm64"
@@ -502,4 +512,8 @@ cat <<EOF >> lib/config.h
EOF
fi
+if [ "$add_config" ]; then
+ echo "/* Additional configs from $add_config */" >> lib/config.h
+ cat "$add_config" >> lib/config.h
+fi
echo "#endif" >> lib/config.h
--
2.46.0
next prev parent reply other threads:[~2024-09-03 21:25 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-03 14:39 [kvm-unit-tests PATCH 0/2] configure: Support CONFIG_* extension Andrew Jones
2024-09-03 14:39 ` Andrew Jones [this message]
2024-09-11 0:39 ` [kvm-unit-tests PATCH 1/2] configure: Introduce add-config Nicholas Piggin
2024-09-11 8:15 ` Andrew Jones
2024-09-03 14:39 ` [kvm-unit-tests PATCH 2/2] riscv: Make NR_CPUS configurable Andrew Jones
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=20240903143946.834864-5-andrew.jones@linux.dev \
--to=andrew.jones@linux.dev \
--cc=atishp@rivosinc.com \
--cc=cade.richard@berkeley.edu \
--cc=frankja@linux.ibm.com \
--cc=imbrenda@linux.ibm.com \
--cc=jamestiotio@gmail.com \
--cc=kvm-riscv@lists.infradead.org \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.linux.dev \
--cc=linux-s390@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=lvivier@redhat.com \
--cc=nrb@linux.ibm.com \
--cc=pbonzini@redhat.com \
--cc=thuth@redhat.com \
/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).