All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Dr. David Alan Gilbert (git)" <dgilbert@redhat.com>
To: qemu-devel@nongnu.org, wainersm@redhat.com, groug@kaod.org,
	philmd@redhat.com, vgoyal@redhat.com
Cc: virtio-fs@redhat.com
Subject: [PULL 1/6] virtiofsd: Allow to build it without the tools
Date: Tue, 16 Feb 2021 18:37:29 +0000	[thread overview]
Message-ID: <20210216183734.57810-2-dgilbert@redhat.com> (raw)
In-Reply-To: <20210216183734.57810-1-dgilbert@redhat.com>

From: Wainer dos Santos Moschetta <wainersm@redhat.com>

This changed the Meson build script to allow virtiofsd be built even
though the tools build is disabled, thus honoring the --enable-virtiofsd
option.

Fixes: cece116c939d219070b250338439c2d16f94e3da (configure: add option for virtiofsd)
Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Message-Id: <20210201211456.1133364-2-wainersm@redhat.com>
Reviewed-by: Misono Tomohiro <misono.tomohiro@jp.fujitsu.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
 tools/meson.build | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tools/meson.build b/tools/meson.build
index fdce66857d..3e5a0abfa2 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -10,8 +10,11 @@ if get_option('virtiofsd').enabled()
       error('virtiofsd requires Linux')
     elif not seccomp.found() or not libcap_ng.found()
       error('virtiofsd requires libcap-ng-devel and seccomp-devel')
-    elif not have_tools or 'CONFIG_VHOST_USER' not in config_host
-      error('virtiofsd needs tools and vhost-user support')
+    elif 'CONFIG_VHOST_USER' not in config_host
+      error('virtiofsd needs vhost-user support')
+    else
+      # Disabled all the tools but virtiofsd.
+      have_virtiofsd = true
     endif
   endif
 elif get_option('virtiofsd').disabled() or not have_system
-- 
2.29.2



WARNING: multiple messages have this Message-ID (diff)
From: "Dr. David Alan Gilbert (git)" <dgilbert@redhat.com>
To: qemu-devel@nongnu.org, wainersm@redhat.com, groug@kaod.org,
	philmd@redhat.com, vgoyal@redhat.com
Cc: virtio-fs@redhat.com
Subject: [Virtio-fs] [PULL 1/6] virtiofsd: Allow to build it without the tools
Date: Tue, 16 Feb 2021 18:37:29 +0000	[thread overview]
Message-ID: <20210216183734.57810-2-dgilbert@redhat.com> (raw)
In-Reply-To: <20210216183734.57810-1-dgilbert@redhat.com>

From: Wainer dos Santos Moschetta <wainersm@redhat.com>

This changed the Meson build script to allow virtiofsd be built even
though the tools build is disabled, thus honoring the --enable-virtiofsd
option.

Fixes: cece116c939d219070b250338439c2d16f94e3da (configure: add option for virtiofsd)
Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Message-Id: <20210201211456.1133364-2-wainersm@redhat.com>
Reviewed-by: Misono Tomohiro <misono.tomohiro@jp.fujitsu.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
 tools/meson.build | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tools/meson.build b/tools/meson.build
index fdce66857d..3e5a0abfa2 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -10,8 +10,11 @@ if get_option('virtiofsd').enabled()
       error('virtiofsd requires Linux')
     elif not seccomp.found() or not libcap_ng.found()
       error('virtiofsd requires libcap-ng-devel and seccomp-devel')
-    elif not have_tools or 'CONFIG_VHOST_USER' not in config_host
-      error('virtiofsd needs tools and vhost-user support')
+    elif 'CONFIG_VHOST_USER' not in config_host
+      error('virtiofsd needs vhost-user support')
+    else
+      # Disabled all the tools but virtiofsd.
+      have_virtiofsd = true
     endif
   endif
 elif get_option('virtiofsd').disabled() or not have_system
-- 
2.29.2


  reply	other threads:[~2021-02-16 18:40 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-16 18:37 [PULL 0/6] virtiofs queue Dr. David Alan Gilbert (git)
2021-02-16 18:37 ` [Virtio-fs] " Dr. David Alan Gilbert (git)
2021-02-16 18:37 ` Dr. David Alan Gilbert (git) [this message]
2021-02-16 18:37   ` [Virtio-fs] [PULL 1/6] virtiofsd: Allow to build it without the tools Dr. David Alan Gilbert (git)
2021-02-16 18:37 ` [PULL 2/6] virtiofsd: vu_dispatch locking should never fail Dr. David Alan Gilbert (git)
2021-02-16 18:37   ` [Virtio-fs] " Dr. David Alan Gilbert (git)
2021-02-16 18:37 ` [PULL 3/6] tools/virtiofsd: Replace the word 'whitelist' Dr. David Alan Gilbert (git)
2021-02-16 18:37   ` [Virtio-fs] " Dr. David Alan Gilbert (git)
2021-02-16 18:37 ` [PULL 4/6] virtiofsd: Save error code early at the failure callsite Dr. David Alan Gilbert (git)
2021-02-16 18:37   ` [Virtio-fs] " Dr. David Alan Gilbert (git)
2021-02-16 18:37 ` [PULL 5/6] viriofsd: Add support for FUSE_HANDLE_KILLPRIV_V2 Dr. David Alan Gilbert (git)
2021-02-16 18:37   ` [Virtio-fs] " Dr. David Alan Gilbert (git)
2021-02-16 18:37 ` [PULL 6/6] virtiofsd: Do not use a thread pool by default Dr. David Alan Gilbert (git)
2021-02-16 18:37   ` [Virtio-fs] " Dr. David Alan Gilbert (git)
2021-02-17 19:18 ` [PULL 0/6] virtiofs queue Peter Maydell
2021-02-17 19:18   ` [Virtio-fs] " 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=20210216183734.57810-2-dgilbert@redhat.com \
    --to=dgilbert@redhat.com \
    --cc=groug@kaod.org \
    --cc=philmd@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=vgoyal@redhat.com \
    --cc=virtio-fs@redhat.com \
    --cc=wainersm@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.