mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

util/vhost-user-server: use static library in meson.build

Browse Source 
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
[Added CONFIG_LINUX again because libvhost-user doesn't build on macOS.
--Stefan]
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2020-09-24 16:15:49 +01:00
parent 80a06cc52b
commit 3a213f83d9
5 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
block/export/export.c
View File

@ -17,17 +17,17 @@
#include "sysemu/block-backend.h" #include "sysemu/block-backend.h"
#include "block/export.h" #include "block/export.h"
#include "block/nbd.h" #include "block/nbd.h"
#if CONFIG_LINUX
#include "block/export/vhost-user-blk-server.h"
#endif
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qapi-commands-block-export.h" #include "qapi/qapi-commands-block-export.h"
#include "qapi/qapi-events-block-export.h" #include "qapi/qapi-events-block-export.h"
#include "qemu/id.h" #include "qemu/id.h"
#if defined(CONFIG_LINUX) && defined(CONFIG_VHOST_USER)
#include "vhost-user-blk-server.h"
#endif
static const BlockExportDriver *blk_exp_drivers[] = { static const BlockExportDriver *blk_exp_drivers[] = {
&blk_exp_nbd, &blk_exp_nbd,
#if CONFIG_LINUX #if defined(CONFIG_LINUX) && defined(CONFIG_VHOST_USER)
&blk_exp_vhost_user_blk, &blk_exp_vhost_user_blk,
#endif #endif
}; };

2
block/export/meson.build
View File

@ -1,2 +1,2 @@
block_ss.add(files('export.c')) 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_LINUX', 'CONFIG_VHOST_USER'], if_true: files('vhost-user-blk-server.c'))

1
contrib/libvhost-user/meson.build
View File

@ -1,3 +1,4 @@
libvhost_user = static_library('vhost-user', libvhost_user = static_library('vhost-user',
files('libvhost-user.c', 'libvhost-user-glib.c'), files('libvhost-user.c', 'libvhost-user-glib.c'),
build_by_default: false) build_by_default: false)
vhost_user = declare_dependency(link_with: libvhost_user)

6
meson.build
View File

@ -1398,6 +1398,11 @@ trace_events_subdirs += [
'util', 'util',
] ]
vhost_user = not_found
if 'CONFIG_VHOST_USER' in config_host
subdir('contrib/libvhost-user')
endif
subdir('qapi') subdir('qapi')
subdir('qobject') subdir('qobject')
subdir('stubs') subdir('stubs')
@ -1830,7 +1835,6 @@ if have_tools
install: true) install: true)
if 'CONFIG_VHOST_USER' in config_host if 'CONFIG_VHOST_USER' in config_host
subdir('contrib/libvhost-user')
subdir('contrib/vhost-user-blk') subdir('contrib/vhost-user-blk')
subdir('contrib/vhost-user-gpu') subdir('contrib/vhost-user-gpu')
subdir('contrib/vhost-user-input') subdir('contrib/vhost-user-input')

4
util/meson.build
View File

@ -66,7 +66,9 @@ if have_block
util_ss.add(files('main-loop.c')) util_ss.add(files('main-loop.c'))
util_ss.add(files('nvdimm-utils.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(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_LINUX', 'CONFIG_VHOST_USER'], if_true: [
files('vhost-user-server.c'), vhost_user
])
util_ss.add(files('block-helpers.c')) util_ss.add(files('block-helpers.c'))
util_ss.add(files('qemu-coroutine-sleep.c')) util_ss.add(files('qemu-coroutine-sleep.c'))
util_ss.add(files('qemu-co-shared-resource.c')) util_ss.add(files('qemu-co-shared-resource.c'))