qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>,
	"Gerd Hoffmann" <kraxel@redhat.com>
Subject: [PATCH 1/3] meson: Only build virtfs-proxy-helper if all requisites are found
Date: Tue, 25 May 2021 12:46:46 +0200	[thread overview]
Message-ID: <20210525104648.4060904-2-philmd@redhat.com> (raw)
In-Reply-To: <20210525104648.4060904-1-philmd@redhat.com>

We first set have_virtfs_proxy_helper depending on have_virtfs,
then update have_virtfs... While this might work, it is not clear
when looking at the code logic. Move the have_virtfs_proxy_helper
assignation *after* updating have_virtfs to make it obvious.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 meson.build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index 632b380738d..2a7d69cf428 100644
--- a/meson.build
+++ b/meson.build
@@ -1081,8 +1081,6 @@
     libattr.found() and
     libcap_ng.found())
 
-have_virtfs_proxy_helper = have_virtfs and have_tools
-
 if get_option('virtfs').enabled()
   if not have_virtfs
     if targetos != 'linux'
@@ -1097,6 +1095,8 @@
   have_virtfs = false
 endif
 
+have_virtfs_proxy_helper = have_virtfs and have_tools
+
 config_host_data.set_quoted('CONFIG_BINDIR', get_option('prefix') / get_option('bindir'))
 config_host_data.set_quoted('CONFIG_PREFIX', get_option('prefix'))
 config_host_data.set_quoted('CONFIG_QEMU_CONFDIR', get_option('prefix') / qemu_confdir)
-- 
2.26.3



  reply	other threads:[~2021-05-25 10:49 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-25 10:46 [PATCH 0/3] meson: Minor improvements Philippe Mathieu-Daudé
2021-05-25 10:46 ` Philippe Mathieu-Daudé [this message]
2021-05-25 23:19   ` [PATCH 1/3] meson: Only build virtfs-proxy-helper if all requisites are found Richard Henderson
2021-05-25 10:46 ` [PATCH 2/3] meson: List if X11 dependency is detected Philippe Mathieu-Daudé
2021-05-25 23:19   ` Richard Henderson
2021-05-25 10:46 ` [PATCH 3/3] meson: List modules built in summary Philippe Mathieu-Daudé
2021-05-26  7:29   ` Philippe Mathieu-Daudé
2021-05-27 20:08   ` 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=20210525104648.4060904-2-philmd@redhat.com \
    --to=philmd@redhat.com \
    --cc=kraxel@redhat.com \
    --cc=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).