[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/24] crypto: only include tls-cipher-suites in emulators
From: |
Paolo Bonzini |
Subject: |
[PULL 11/24] crypto: only include tls-cipher-suites in emulators |
Date: |
Tue, 3 Oct 2023 10:30:28 +0200 |
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.
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
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
- [PULL 00/24] Audio, build system, misc fixes for 2023-10-03, Paolo Bonzini, 2023/10/03
- [PULL 01/24] optionrom: Remove build-id section, Paolo Bonzini, 2023/10/03
- [PULL 06/24] meson: clean up static_library keyword arguments, Paolo Bonzini, 2023/10/03
- [PULL 02/24] accel/kvm/kvm-all: Handle register access errors, Paolo Bonzini, 2023/10/03
- [PULL 03/24] e1000: remove old compatibility code, Paolo Bonzini, 2023/10/03
- [PULL 07/24] Makefile: build plugins before running TCG tests, Paolo Bonzini, 2023/10/03
- [PULL 11/24] crypto: only include tls-cipher-suites in emulators,
Paolo Bonzini <=
- [PULL 12/24] ui/vnc: Require audiodev= to enable audio, Paolo Bonzini, 2023/10/03
- [PULL 05/24] make-release: do not ship dtc sources, Paolo Bonzini, 2023/10/03
- [PULL 10/24] scsi-disk: ensure that FORMAT UNIT commands are terminated, Paolo Bonzini, 2023/10/03
- [PULL 21/24] hw/ppc: Support machine-default audiodev with fallback, Paolo Bonzini, 2023/10/03
- [PULL 08/24] esp: use correct type for esp_dma_enable() in sysbus_esp_gpio_demux(), Paolo Bonzini, 2023/10/03
- [PULL 15/24] audio: return Error ** from audio_state_by_name, Paolo Bonzini, 2023/10/03
- [PULL 16/24] audio: commonize voice initialization, Paolo Bonzini, 2023/10/03
- [PULL 19/24] Introduce machine property "audiodev", Paolo Bonzini, 2023/10/03
- [PULL 17/24] audio: simplify flow in audio_init, Paolo Bonzini, 2023/10/03
- [PULL 04/24] pc: remove short_root_bus property, Paolo Bonzini, 2023/10/03