From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Thomas Huth" <thuth@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>
Subject: [PULL 26/28] configure: Avoid error messages about missing *-config-*.h files
Date: Mon, 24 May 2021 18:41:29 +0200 [thread overview]
Message-ID: <20210524164131.383778-27-pbonzini@redhat.com> (raw)
In-Reply-To: <20210524164131.383778-1-pbonzini@redhat.com>
From: Thomas Huth <thuth@redhat.com>
When compiling with --disable-system there is a harmless yet still
annoying error message at the end of the "configure" step:
sed: can't read *-config-devices.h: No such file or directory
When only building the tools or docs, without any emulator at all,
there is even an additional message about missing *-config-target.h
files.
Fix it by checking whether any of these files are available before
using them.
Fixes: e0447a834d ("configure: Poison all current target-specific #defines")
Reported-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210519113840.298174-1-thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/configure b/configure
index cca532bb0c..90c0807347 100755
--- a/configure
+++ b/configure
@@ -6503,10 +6503,14 @@ fi
# Create list of config switches that should be poisoned in common code...
# but filter out CONFIG_TCG and CONFIG_USER_ONLY which are special.
-sed -n -e '/CONFIG_TCG/d' -e '/CONFIG_USER_ONLY/d' \
- -e '/^#define / { s///; s/ .*//; s/^/#pragma GCC poison /p; }' \
- *-config-devices.h *-config-target.h | \
- sort -u > config-poison.h
+target_configs_h=$(ls *-config-devices.h *-config-target.h 2>/dev/null)
+if test -n "$target_configs_h" ; then
+ sed -n -e '/CONFIG_TCG/d' -e '/CONFIG_USER_ONLY/d' \
+ -e '/^#define / { s///; s/ .*//; s/^/#pragma GCC poison /p; }' \
+ $target_configs_h | sort -u > config-poison.h
+else
+ :> config-poison.h
+fi
# Save the configure command line for later reuse.
cat <<EOD >config.status
--
2.31.1
next prev parent reply other threads:[~2021-05-24 17:29 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-24 16:41 [PULL 00/28] Misc patches for 2021-05-24 Paolo Bonzini
2021-05-24 16:41 ` [PULL 01/28] configure: Only clone softfloat-3 repositories if TCG is enabled Paolo Bonzini
2021-05-24 16:41 ` [PULL 02/28] configure: check for submodules if --with-git-submodules=ignore Paolo Bonzini
2021-05-24 16:41 ` [PULL 03/28] configure: simplify assignment to GIT_SUBMODULES Paolo Bonzini
2021-05-24 16:41 ` [PULL 04/28] hw/mem/nvdimm: Use Kconfig 'imply' instead of 'depends on' Paolo Bonzini
2021-05-24 16:41 ` [PULL 05/28] i386/cpu: Expose AVX_VNNI instruction to guest Paolo Bonzini
2021-05-24 16:41 ` [PULL 06/28] object: add more commands to preconfig mode Paolo Bonzini
2021-05-24 16:41 ` [PULL 07/28] qtest: add a QOM object for qtest Paolo Bonzini
2021-06-04 15:37 ` Eric Blake
2021-06-04 15:45 ` Philippe Mathieu-Daudé
2021-06-04 15:48 ` Philippe Mathieu-Daudé
2021-05-24 16:41 ` [PULL 08/28] KVM: do not allow setting properties at runtime Paolo Bonzini
2021-05-24 16:41 ` [PULL 09/28] memory: Introduce log_sync_global() to memory listener Paolo Bonzini
2021-05-24 16:41 ` [PULL 10/28] KVM: Use a big lock to replace per-kml slots_lock Paolo Bonzini
2021-05-24 16:41 ` [PULL 11/28] KVM: Create the KVMSlot dirty bitmap on flag changes Paolo Bonzini
2021-05-24 16:41 ` [PULL 12/28] KVM: Provide helper to get kvm dirty log Paolo Bonzini
2021-05-24 16:41 ` [PULL 13/28] KVM: Provide helper to sync dirty bitmap from slot to ramblock Paolo Bonzini
2021-05-24 16:41 ` [PULL 14/28] KVM: Simplify dirty log sync in kvm_set_phys_mem Paolo Bonzini
2021-05-24 16:41 ` [PULL 15/28] KVM: Cache kvm slot dirty bitmap size Paolo Bonzini
2021-05-24 16:41 ` [PULL 16/28] KVM: Add dirty-ring-size property Paolo Bonzini
2021-05-24 16:41 ` [PULL 17/28] KVM: Disable manual dirty log when dirty ring enabled Paolo Bonzini
2021-05-24 16:41 ` [PULL 18/28] KVM: Dirty ring support Paolo Bonzini
2021-05-24 16:41 ` [PULL 19/28] tests/qtest/fuzz: Fix build failure Paolo Bonzini
2021-05-24 16:41 ` [PULL 20/28] meson: Set implicit_include_directories to false Paolo Bonzini
2021-05-24 16:41 ` [PULL 21/28] remove qemu-options* from root directory Paolo Bonzini
2021-05-24 16:41 ` [PULL 22/28] replication: move include out of " Paolo Bonzini
2021-05-24 16:41 ` [PULL 23/28] vl: allow not specifying size in -m when using -M memory-backend Paolo Bonzini
2021-05-24 16:41 ` [PULL 24/28] qemu-config: load modules when instantiating option groups Paolo Bonzini
2021-05-24 16:41 ` [PULL 25/28] doc: Add notes about -mon option mode=control argument Paolo Bonzini
2021-05-24 16:41 ` Paolo Bonzini [this message]
2021-05-24 16:41 ` [PULL 27/28] hw/scsi: Fix sector translation bug in scsi_unmap_complete_noio Paolo Bonzini
2021-05-24 16:41 ` [PULL 28/28] gitlab-ci: use --meson=git for CFI jobs Paolo Bonzini
2021-05-24 17:39 ` [PULL 00/28] Misc patches for 2021-05-24 no-reply
2021-05-24 18:02 ` Peter Maydell
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=20210524164131.383778-27-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=f4bug@amsat.org \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--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).