From: Stefan Hajnoczi <stefanha@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>, qemu-devel@nongnu.org
Cc: "Kevin Wolf" <kwolf@redhat.com>,
"Laurent Vivier" <lvivier@redhat.com>,
"Thomas Huth" <thuth@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
qemu-block@nongnu.org, "Markus Armbruster" <armbru@redhat.com>,
"Coiby Xu" <Coiby.Xu@gmail.com>, "Max Reitz" <mreitz@redhat.com>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Cleber Rosa" <crosa@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Fam Zheng" <fam@euphon.net>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>
Subject: [PULL v2 20/30] util/vhost-user-server: use static library in meson.build
Date: Mon, 12 Oct 2020 19:27:50 +0100 [thread overview]
Message-ID: <20201012182800.157697-21-stefanha@redhat.com> (raw)
In-Reply-To: <20201012182800.157697-1-stefanha@redhat.com>
Don't compile contrib/libvhost-user/libvhost-user.c again. Instead build
the static library once and then reuse it throughout QEMU.
Also switch from CONFIG_LINUX to CONFIG_VHOST_USER, which is what the
vhost-user tools (vhost-user-gpu, etc) do.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 20200924151549.913737-14-stefanha@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
block/export/export.c | 8 ++++----
block/export/meson.build | 2 +-
contrib/libvhost-user/meson.build | 1 +
meson.build | 6 +++++-
tests/qtest/meson.build | 2 +-
util/meson.build | 4 +++-
6 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/block/export/export.c b/block/export/export.c
index bd7cac241f..550897e236 100644
--- a/block/export/export.c
+++ b/block/export/export.c
@@ -17,17 +17,17 @@
#include "sysemu/block-backend.h"
#include "block/export.h"
#include "block/nbd.h"
-#if CONFIG_LINUX
-#include "block/export/vhost-user-blk-server.h"
-#endif
#include "qapi/error.h"
#include "qapi/qapi-commands-block-export.h"
#include "qapi/qapi-events-block-export.h"
#include "qemu/id.h"
+#ifdef CONFIG_VHOST_USER
+#include "vhost-user-blk-server.h"
+#endif
static const BlockExportDriver *blk_exp_drivers[] = {
&blk_exp_nbd,
-#if CONFIG_LINUX
+#ifdef CONFIG_VHOST_USER
&blk_exp_vhost_user_blk,
#endif
};
diff --git a/block/export/meson.build b/block/export/meson.build
index ef3a9576f7..469a7aa0f5 100644
--- a/block/export/meson.build
+++ b/block/export/meson.build
@@ -1,2 +1,2 @@
block_ss.add(files('export.c'))
-block_ss.add(when: 'CONFIG_LINUX', if_true: files('vhost-user-blk-server.c', '../../contrib/libvhost-user/libvhost-user.c'))
+block_ss.add(when: 'CONFIG_VHOST_USER', if_true: files('vhost-user-blk-server.c'))
diff --git a/contrib/libvhost-user/meson.build b/contrib/libvhost-user/meson.build
index e68dd1a581..a261e7665f 100644
--- a/contrib/libvhost-user/meson.build
+++ b/contrib/libvhost-user/meson.build
@@ -1,3 +1,4 @@
libvhost_user = static_library('vhost-user',
files('libvhost-user.c', 'libvhost-user-glib.c'),
build_by_default: false)
+vhost_user = declare_dependency(link_with: libvhost_user)
diff --git a/meson.build b/meson.build
index 17c89c87c6..4ddd899fdd 100644
--- a/meson.build
+++ b/meson.build
@@ -1297,6 +1297,11 @@ trace_events_subdirs += [
'util',
]
+vhost_user = not_found
+if 'CONFIG_VHOST_USER' in config_host
+ subdir('contrib/libvhost-user')
+endif
+
subdir('qapi')
subdir('qobject')
subdir('stubs')
@@ -1680,7 +1685,6 @@ if have_tools
install: true)
if 'CONFIG_VHOST_USER' in config_host
- subdir('contrib/libvhost-user')
subdir('contrib/vhost-user-blk')
subdir('contrib/vhost-user-gpu')
subdir('contrib/vhost-user-input')
diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
index 6fe217262b..6fb450ddce 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -192,7 +192,7 @@ qos_test_ss.add(
)
qos_test_ss.add(when: 'CONFIG_VIRTFS', if_true: files('virtio-9p-test.c'))
qos_test_ss.add(when: 'CONFIG_VHOST_USER', if_true: files('vhost-user-test.c'))
-qos_test_ss.add(when: ['CONFIG_LINUX', 'CONFIG_TOOLS'], if_true: files('vhost-user-blk-test.c'))
+qos_test_ss.add(when: ['CONFIG_VHOST_USER', 'CONFIG_TOOLS'], if_true: files('vhost-user-blk-test.c'))
extra_qtest_deps = {
'bios-tables-test': [io],
diff --git a/util/meson.build b/util/meson.build
index 2296e81b34..9b2a7a5de9 100644
--- a/util/meson.build
+++ b/util/meson.build
@@ -66,7 +66,9 @@ if have_block
util_ss.add(files('main-loop.c'))
util_ss.add(files('nvdimm-utils.c'))
util_ss.add(files('qemu-coroutine.c', 'qemu-coroutine-lock.c', 'qemu-coroutine-io.c'))
- util_ss.add(when: 'CONFIG_LINUX', if_true: files('vhost-user-server.c'))
+ util_ss.add(when: 'CONFIG_VHOST_USER', if_true: [
+ files('vhost-user-server.c'), vhost_user
+ ])
util_ss.add(files('block-helpers.c'))
util_ss.add(files('qemu-coroutine-sleep.c'))
util_ss.add(files('qemu-co-shared-resource.c'))
--
2.26.2
next prev parent reply other threads:[~2020-10-12 18:47 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-12 18:27 [PULL v2 00/30] Block patches Stefan Hajnoczi
2020-10-12 18:27 ` [PULL v2 01/30] block/nvme: Add driver statistics for access alignment and hw errors Stefan Hajnoczi
2020-10-12 18:27 ` [PULL v2 02/30] libvhost-user: Allow vu_message_read to be replaced Stefan Hajnoczi
2020-10-12 18:27 ` [PULL v2 03/30] libvhost-user: remove watch for kick_fd when de-initialize vu-dev Stefan Hajnoczi
2020-10-12 18:27 ` [PULL v2 04/30] util/vhost-user-server: generic vhost user server Stefan Hajnoczi
2020-10-12 18:27 ` [PULL v2 05/30] block: move logical block size check function to a common utility function Stefan Hajnoczi
2020-10-12 18:27 ` [PULL v2 06/30] block/export: vhost-user block device backend server Stefan Hajnoczi
2020-10-12 18:27 ` [PULL v2 07/30] test: new qTest case to test the vhost-user-blk-server Stefan Hajnoczi
2020-10-12 18:27 ` [PULL v2 08/30] MAINTAINERS: Add vhost-user block device backend server maintainer Stefan Hajnoczi
2020-10-12 18:27 ` [PULL v2 09/30] util/vhost-user-server: s/fileds/fields/ typo fix Stefan Hajnoczi
2020-10-12 18:27 ` [PULL v2 10/30] util/vhost-user-server: drop unnecessary QOM cast Stefan Hajnoczi
2020-10-12 18:27 ` [PULL v2 11/30] util/vhost-user-server: drop unnecessary watch deletion Stefan Hajnoczi
2020-10-12 18:27 ` [PULL v2 12/30] block/export: consolidate request structs into VuBlockReq Stefan Hajnoczi
2020-10-12 18:27 ` [PULL v2 13/30] util/vhost-user-server: drop unused DevicePanicNotifier Stefan Hajnoczi
2020-10-12 18:27 ` [PULL v2 14/30] util/vhost-user-server: fix memory leak in vu_message_read() Stefan Hajnoczi
2020-10-12 18:27 ` [PULL v2 15/30] util/vhost-user-server: check EOF when reading payload Stefan Hajnoczi
2020-10-12 18:27 ` [PULL v2 16/30] util/vhost-user-server: rework vu_client_trip() coroutine lifecycle Stefan Hajnoczi
2020-10-12 18:27 ` [PULL v2 17/30] block/export: report flush errors Stefan Hajnoczi
2020-10-12 18:27 ` [PULL v2 18/30] block/export: convert vhost-user-blk server to block export API Stefan Hajnoczi
2020-10-12 18:27 ` [PULL v2 19/30] util/vhost-user-server: move header to include/ Stefan Hajnoczi
2020-10-12 18:27 ` Stefan Hajnoczi [this message]
2020-10-12 18:27 ` [PULL v2 21/30] qemu-storage-daemon: avoid compiling blockdev_ss twice Stefan Hajnoczi
2020-10-12 18:27 ` [PULL v2 22/30] block: move block exports to libblockdev Stefan Hajnoczi
2020-10-12 18:27 ` [PULL v2 23/30] block/export: add iothread and fixed-iothread options Stefan Hajnoczi
2020-10-12 18:27 ` [PULL v2 24/30] block/export: add vhost-user-blk multi-queue support Stefan Hajnoczi
2020-10-12 18:27 ` [PULL v2 25/30] tests/qtest: add multi-queue test case to vhost-user-blk-test Stefan Hajnoczi
2020-10-12 18:27 ` [PULL v2 26/30] block/io: fix bdrv_co_block_status_above Stefan Hajnoczi
2020-10-12 18:27 ` [PULL v2 27/30] block/io: bdrv_common_block_status_above: support include_base Stefan Hajnoczi
2020-10-12 18:27 ` [PULL v2 28/30] block/io: bdrv_common_block_status_above: support bs == base Stefan Hajnoczi
2020-10-12 18:27 ` [PULL v2 29/30] block/io: fix bdrv_is_allocated_above Stefan Hajnoczi
2020-10-12 18:28 ` [PULL v2 30/30] iotests: add commit top->base cases to 274 Stefan Hajnoczi
2020-10-12 19:00 ` [PULL v2 00/30] Block patches no-reply
2020-10-12 21:48 ` Peter Maydell
2020-10-13 0:05 ` Eric Blake
2020-10-20 15:19 ` Stefan Hajnoczi
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=20201012182800.157697-21-stefanha@redhat.com \
--to=stefanha@redhat.com \
--cc=Coiby.Xu@gmail.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=crosa@redhat.com \
--cc=dgilbert@redhat.com \
--cc=ehabkost@redhat.com \
--cc=fam@euphon.net \
--cc=kwolf@redhat.com \
--cc=lvivier@redhat.com \
--cc=mreitz@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-block@nongnu.org \
--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).