[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 1/3] meson: move vhost_user_blk_server to meson.build
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [PATCH 1/3] meson: move vhost_user_blk_server to meson.build |
Date: |
Wed, 11 Nov 2020 12:54:38 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 |
On 11/11/20 12:44 PM, Philippe Mathieu-Daudé wrote:
> On 11/11/20 10:41 AM, Philippe Mathieu-Daudé wrote:
>> On 11/10/20 6:11 PM, Stefan Hajnoczi wrote:
>>> 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
>>
>> Something is odd:
>>
>> $ ../configure --disable-system --enable-vhost-user-blk-server
>
> I failed when pasting, this misses '--disable-tools' to make sense.
>
> We define in meson.build:
>
> have_block = have_system or have_tools
>
> Maybe this is the one you want instead of have_system?
This snippet seems to fix:
-- >8 --
--- a/meson.build
+++ b/meson.build
@@ -751,6 +751,10 @@
has_statx = cc.links(statx_test)
+if 'CONFIG_VHOST_USER' in config_host and not (have_system or have_tools)
+ error('vhost-user does not make sense without system or tools
support enabled')
+endif
+
have_vhost_user_blk_server = (targetos == 'linux' and
'CONFIG_VHOST_USER' in config_host)
---
$ ../configure --disable-system --enable-vhost-user-blk-server
../source/qemu/meson.build:755:4: ERROR: Problem encountered: vhost-user
does not make sense without system or tools support enabled
I'll send a patch.
Phil.
[PATCH 2/3] vhost-user-blk-server: depend on CONFIG_VHOST_USER, Stefan Hajnoczi, 2020/11/10
[PATCH 3/3] configure: mark vhost-user Linux-only, Stefan Hajnoczi, 2020/11/10