Re: [DRAFT PATCH 000/143] Meson integration for 5.2

[Paolo Bonzini]

On 07/08/20 12:02, Thomas Huth wrote:
> Thanks! With the fix, it now gets a little bit further, but then stops with:
> 
>   ../meson.build:1258:3: ERROR: Key CONFIG_QEMU_PRIVATE_XTS is not in dict
>  https://gitlab.com/huth/qemu/-/jobs/675699330#L130

diff --git a/meson.build b/meson.build
index d14d4bb..5bcfa09 100644
--- a/meson.build
+++ b/meson.build
@@ -944,12 +944,12 @@ summary_info += {'GNUTLS support':    
config_host.has_key('CONFIG_GNUTLS')}
 summary_info += {'libgcrypt':         config_host.has_key('CONFIG_GCRYPT')}
 if config_host.has_key('CONFIG_GCRYPT')
    summary_info += {'  hmac':            
config_host.has_key('CONFIG_GCRYPT_HMAC')}
-   summary_info += {'  XTS':             
config_host['CONFIG_QEMU_PRIVATE_XTS'] != 'y'}
+   summary_info += {'  XTS':             not 
config_host.has_key('CONFIG_QEMU_PRIVATE_XTS')}
 endif
 # TODO: add back version
 summary_info += {'nettle':            config_host.has_key('CONFIG_NETTLE')}
 if config_host.has_key('CONFIG_NETTLE')
-   summary_info += {'  XTS':             
config_host['CONFIG_QEMU_PRIVATE_XTS'] != 'y'}
+   summary_info += {'  XTS':             not 
config_host.has_key('CONFIG_QEMU_PRIVATE_XTS')}
 endif
 summary_info += {'libtasn1':          config_host.has_key('CONFIG_TASN1')}
 summary_info += {'PAM':               config_host.has_key('CONFIG_AUTH_PAM')}

:)

Thanks very much.  Sorry for the amount of breakage, at least it's all
been trivial to fix so far.

Paolo