diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2020-09-24 16:15:49 +0100 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2020-10-23 13:42:16 +0100 |
| commit | 3a213f83d99687e6648702421675a922ea71d593 (patch) | |
| tree | c48ebd402076d7389a2b71eb62e2c0e71b64630f /util | |
| parent | 80a06cc52bcf7a9771407306991a816834c04941 (diff) | |
| download | qemu-3a213f83d99687e6648702421675a922ea71d593.zip qemu-3a213f83d99687e6648702421675a922ea71d593.tar.gz qemu-3a213f83d99687e6648702421675a922ea71d593.tar.bz2 | |
util/vhost-user-server: use static library in meson.build
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>
Diffstat (limited to 'util')
| -rw-r--r-- | util/meson.build | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/util/meson.build b/util/meson.build index 2296e81..c5159ad 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_LINUX', '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')) |