diff options
| author | Stefan Hajnoczi | 2020-11-10 18:11:19 +0100 |
|---|---|---|
| committer | Michael S. Tsirkin | 2020-11-12 15:19:40 +0100 |
| commit | e5e856c1eb4b85fe96472cf7aed48e336fe5ce74 (patch) | |
| tree | 5546b79ce042f2e17a2c0a9dbd052d90b533ec60 /block/export | |
| parent | vhost-user: fix VHOST_USER_ADD/REM_MEM_REG truncation (diff) | |
| download | qemu-e5e856c1eb4b85fe96472cf7aed48e336fe5ce74.tar.gz qemu-e5e856c1eb4b85fe96472cf7aed48e336fe5ce74.tar.xz qemu-e5e856c1eb4b85fe96472cf7aed48e336fe5ce74.zip | |
meson: move vhost_user_blk_server to meson.build
The --enable/disable-vhost-user-blk-server options were implemented in
./configure. There has been confusion about them and part of the problem
is that the shell syntax used for setting the default value is not easy
to read. Move the option over to meson where the conditions are easier
to understand:
have_vhost_user_blk_server = (targetos == 'linux')
if get_option('vhost_user_blk_server').enabled()
if targetos != 'linux'
error('vhost_user_blk_server requires linux')
endif
elif get_option('vhost_user_blk_server').disabled() or not have_system
have_vhost_user_blk_server = false
endif
This patch does not change behavior.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20201110171121.1265142-2-stefanha@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Diffstat (limited to 'block/export')
| -rw-r--r-- | block/export/meson.build | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/block/export/meson.build b/block/export/meson.build index 19526435d8..135b356775 100644 --- a/block/export/meson.build +++ b/block/export/meson.build @@ -1,2 +1,5 @@ blockdev_ss.add(files('export.c')) -blockdev_ss.add(when: 'CONFIG_VHOST_USER_BLK_SERVER', if_true: files('vhost-user-blk-server.c')) + +if have_vhost_user_blk_server + blockdev_ss.add(files('vhost-user-blk-server.c')) +endif |