From 51c310097832724bafac26aed81399da40128400 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= <eperezma@redhat.com>

Date: Thu, 21 Jul 2022 15:50:43 +0200

Subject: [PATCH 05/32] meson: create have_vhost_* variables

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

RH-Author: Eugenio Pérez <eperezma@redhat.com>

RH-MergeRequest: 108: Net Control Virtqueue shadow Support

RH-Commit: [5/27] 3b30f89e6d639923dc9d9a92a4261bb4509e5c83 (eperezmartin/qemu-kvm)

RH-Bugzilla: 1939363

RH-Acked-by: Stefano Garzarella <sgarzare@redhat.com>

RH-Acked-by: Cindy Lu <lulu@redhat.com>

RH-Acked-by: Laurent Vivier <lvivier@redhat.com>

Bugzilla: https://bugzilla.redhat.com/1939363

Upstream Status: git://git.qemu.org/qemu.git

commit 2a3129a37652e5e81d12f6e16dd3c447f09831f9

Author: Paolo Bonzini <pbonzini@redhat.com>

Date:   Wed Apr 20 17:34:05 2022 +0200

    meson: create have_vhost_* variables

    When using Meson options rather than config-host.h, the "when" clauses

    have to be changed to if statements (which is not necessarily great,

    though at least it highlights which parts of the build are per-target

    and which are not).

    Do that before moving vhost logic to meson.build, though for now

    the variables are just based on config-host.mak data.

    Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>

    Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Signed-off-by: Eugenio Pérez <eperezma@redhat.com>

---

 meson.build       | 30 ++++++++++++++++++++----------

 tests/meson.build |  2 +-

 tools/meson.build |  2 +-

 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/meson.build b/meson.build

index 13e3323380..735f538497 100644

--- a/meson.build

+++ b/meson.build

@@ -298,6 +298,15 @@ have_tpm = get_option('tpm') \

   .require(targetos != 'windows', error_message: 'TPM emulation only available on POSIX systems') \

   .allowed()

+# vhost

+have_vhost_user = 'CONFIG_VHOST_USER' in config_host

+have_vhost_vdpa = 'CONFIG_VHOST_VDPA' in config_host

+have_vhost_kernel = 'CONFIG_VHOST_KERNEL' in config_host

+have_vhost_net_user = 'CONFIG_VHOST_NET_USER' in config_host

+have_vhost_net_vdpa = 'CONFIG_VHOST_NET_VDPA' in config_host

+have_vhost_net = 'CONFIG_VHOST_NET' in config_host

+have_vhost_user_crypto = 'CONFIG_VHOST_CRYPTO' in config_host

+

 # Target-specific libraries and flags

 libm = cc.find_library('m', required: false)

 threads = dependency('threads')

@@ -1335,7 +1344,7 @@ has_statx_mnt_id = cc.links(statx_mnt_id_test)

 have_vhost_user_blk_server = get_option('vhost_user_blk_server') \

   .require(targetos == 'linux',

            error_message: 'vhost_user_blk_server requires linux') \

-  .require('CONFIG_VHOST_USER' in config_host,

+  .require(have_vhost_user,

            error_message: 'vhost_user_blk_server requires vhost-user support') \

   .disable_auto_if(not have_system) \

   .allowed()

@@ -2116,9 +2125,9 @@ host_kconfig = \

   (have_ivshmem ? ['CONFIG_IVSHMEM=y'] : []) + \

   ('CONFIG_OPENGL' in config_host ? ['CONFIG_OPENGL=y'] : []) + \

   (x11.found() ? ['CONFIG_X11=y'] : []) + \

-  ('CONFIG_VHOST_USER' in config_host ? ['CONFIG_VHOST_USER=y'] : []) + \

-  ('CONFIG_VHOST_VDPA' in config_host ? ['CONFIG_VHOST_VDPA=y'] : []) + \

-  ('CONFIG_VHOST_KERNEL' in config_host ? ['CONFIG_VHOST_KERNEL=y'] : []) + \

+  (have_vhost_user ? ['CONFIG_VHOST_USER=y'] : []) + \

+  (have_vhost_vdpa ? ['CONFIG_VHOST_VDPA=y'] : []) + \

+  (have_vhost_kernel ? ['CONFIG_VHOST_KERNEL=y'] : []) + \

   (have_virtfs ? ['CONFIG_VIRTFS=y'] : []) + \

   ('CONFIG_LINUX' in config_host ? ['CONFIG_LINUX=y'] : []) + \

   ('CONFIG_PVRDMA' in config_host ? ['CONFIG_PVRDMA=y'] : []) + \

@@ -2799,7 +2808,7 @@ if have_system or have_user

 endif

 vhost_user = not_found

-if targetos == 'linux' and 'CONFIG_VHOST_USER' in config_host

+if targetos == 'linux' and have_vhost_user

   libvhost_user = subproject('libvhost-user')

   vhost_user = libvhost_user.get_variable('vhost_user_dep')

 endif

@@ -3386,7 +3395,7 @@ if have_tools

              dependencies: qemuutil,

              install: true)

-  if 'CONFIG_VHOST_USER' in config_host

+  if have_vhost_user

     subdir('contrib/vhost-user-blk')

     subdir('contrib/vhost-user-gpu')

     subdir('contrib/vhost-user-input')

@@ -3516,15 +3525,16 @@ if 'simple' in get_option('trace_backends')

 endif

 summary_info += {'D-Bus display':     dbus_display}

 summary_info += {'QOM debugging':     get_option('qom_cast_debug')}

-summary_info += {'vhost-kernel support': config_host.has_key('CONFIG_VHOST_KERNEL')}

-summary_info += {'vhost-net support': config_host.has_key('CONFIG_VHOST_NET')}

-summary_info += {'vhost-crypto support': config_host.has_key('CONFIG_VHOST_CRYPTO')}

+summary_info += {'vhost-kernel support': have_vhost_kernel}

+summary_info += {'vhost-net support': have_vhost_net}

+summary_info += {'vhost-user support': have_vhost_user}

+summary_info += {'vhost-user-crypto support': have_vhost_user_crypto}

 summary_info += {'vhost-scsi support': config_host.has_key('CONFIG_VHOST_SCSI')}

 summary_info += {'vhost-vsock support': config_host.has_key('CONFIG_VHOST_VSOCK')}

-summary_info += {'vhost-user support': config_host.has_key('CONFIG_VHOST_USER')}

 summary_info += {'vhost-user-blk server support': have_vhost_user_blk_server}

 summary_info += {'vhost-user-fs support': config_host.has_key('CONFIG_VHOST_USER_FS')}

 summary_info += {'vhost-vdpa support': config_host.has_key('CONFIG_VHOST_VDPA')}

+summary_info += {'vhost-vdpa support': have_vhost_vdpa}

 summary_info += {'build guest agent': have_ga}

 summary(summary_info, bool_yn: true, section: 'Configurable features')

diff --git a/tests/meson.build b/tests/meson.build

index 1d05109eb4..bbe41c8559 100644

--- a/tests/meson.build

+++ b/tests/meson.build

@@ -70,7 +70,7 @@ test_deps = {

   'test-qht-par': qht_bench,

 }

-if have_tools and 'CONFIG_VHOST_USER' in config_host and 'CONFIG_LINUX' in config_host

+if have_tools and have_vhost_user and 'CONFIG_LINUX' in config_host

   executable('vhost-user-bridge',

              sources: files('vhost-user-bridge.c'),

              dependencies: [qemuutil, vhost_user])

diff --git a/tools/meson.build b/tools/meson.build

index 46977af84f..10eb3a043f 100644

--- a/tools/meson.build

+++ b/tools/meson.build

@@ -3,7 +3,7 @@ have_virtiofsd = get_option('virtiofsd') \

              error_message: 'virtiofsd requires Linux') \

     .require(seccomp.found() and libcap_ng.found(),

              error_message: 'virtiofsd requires libcap-ng-devel and seccomp-devel') \

-    .require('CONFIG_VHOST_USER' in config_host,

+    .require(have_vhost_user,

              error_message: 'virtiofsd needs vhost-user-support') \

     .disable_auto_if(not have_tools and not have_system) \

     .allowed()

-- 

2.31.1