[PATCH] crypto: only include tls-cipher-suites in emulators

[PATCH] crypto: only include tls-cipher-suites in emulators

[Paolo Bonzini]

tls-cipher-suites is an object that is used to inject TLS configuration
into the guest (via fw_cfg).  It is never used for host-side TLS
operation, and therefore it need not be available in the tools.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 crypto/meson.build   | 3 ++-
 hw/nvram/meson.build | 6 +-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/crypto/meson.build b/crypto/meson.build
index 9ac1a898027..c46f9c22a7f 100644
--- a/crypto/meson.build
+++ b/crypto/meson.build
@@ -46,7 +46,8 @@ endif
 if have_afalg
   crypto_ss.add(if_true: files('afalg.c', 'cipher-afalg.c', 'hash-afalg.c'))
 endif
-crypto_ss.add(when: gnutls, if_true: files('tls-cipher-suites.c'))
+
+system_ss.add(when: gnutls, if_true: files('tls-cipher-suites.c'))
 
 util_ss.add(files(
   'aes.c',
diff --git a/hw/nvram/meson.build b/hw/nvram/meson.build
index 988dff6f8e5..75e415b1a01 100644
--- a/hw/nvram/meson.build
+++ b/hw/nvram/meson.build
@@ -1,8 +1,4 @@
-if have_system or have_tools
-  # QOM interfaces must be available anytime QOM is used.
-  qom_ss.add(files('fw_cfg-interface.c'))
-endif
-
+system_ss.add(files('fw_cfg-interface.c'))
 system_ss.add(files('fw_cfg.c'))
 system_ss.add(when: 'CONFIG_CHRP_NVRAM', if_true: files('chrp_nvram.c'))
 system_ss.add(when: 'CONFIG_DS1225Y', if_true: files('ds1225y.c'))
-- 
2.41.0

Re: [PATCH] crypto: only include tls-cipher-suites in emulators

[Daniel P. Berrangé]

On Thu, Sep 28, 2023 at 09:49:18AM +0200, Paolo Bonzini wrote:
> tls-cipher-suites is an object that is used to inject TLS configuration
> into the guest (via fw_cfg).  It is never used for host-side TLS
> operation, and therefore it need not be available in the tools.
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  crypto/meson.build   | 3 ++-
>  hw/nvram/meson.build | 6 +-----
>  2 files changed, 3 insertions(+), 6 deletions(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [PATCH] crypto: only include tls-cipher-suites in emulators

[Philippe Mathieu-Daudé]

On 28/9/23 09:49, Paolo Bonzini wrote:
> tls-cipher-suites is an object that is used to inject TLS configuration
> into the guest (via fw_cfg).  It is never used for host-side TLS
> operation, and therefore it need not be available in the tools.
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>   crypto/meson.build   | 3 ++-
>   hw/nvram/meson.build | 6 +-----
>   2 files changed, 3 insertions(+), 6 deletions(-)
> 
> diff --git a/crypto/meson.build b/crypto/meson.build
> index 9ac1a898027..c46f9c22a7f 100644
> --- a/crypto/meson.build
> +++ b/crypto/meson.build
> @@ -46,7 +46,8 @@ endif
>   if have_afalg
>     crypto_ss.add(if_true: files('afalg.c', 'cipher-afalg.c', 'hash-afalg.c'))
>   endif
> -crypto_ss.add(when: gnutls, if_true: files('tls-cipher-suites.c'))
> +
> +system_ss.add(when: gnutls, if_true: files('tls-cipher-suites.c'))
>   
>   util_ss.add(files(
>     'aes.c',
> diff --git a/hw/nvram/meson.build b/hw/nvram/meson.build
> index 988dff6f8e5..75e415b1a01 100644
> --- a/hw/nvram/meson.build
> +++ b/hw/nvram/meson.build
> @@ -1,8 +1,4 @@
> -if have_system or have_tools
> -  # QOM interfaces must be available anytime QOM is used.
> -  qom_ss.add(files('fw_cfg-interface.c'))
> -endif
> -
> +system_ss.add(files('fw_cfg-interface.c'))

Thanks, Richard mentioned it and I had it tagged as TODO,
but forgot about it...
https://lore.kernel.org/qemu-devel/8c26026f-26b4-08c0-0e77-ca9970dca279@linaro.org/

FTR the original issue was:
https://lore.kernel.org/qemu-devel/20200929154651.GC4398@linux.fritz.box/

$ qemu-storage-daemon --object help
List of user creatable objects:
qemu-storage-daemon: missing interface 'fw_cfg-data-generator' for 
object 'tls-creds'
Aborted (core dumped)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>