mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-10-15 07:22:46 +00:00
meson: rename config_all
config_all now lists only accelerators, rename it to indicate its actual content. Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
0d66549cf5
commit
cfc1a889e5
|
@ -5,7 +5,7 @@ mips_ss.add(when: 'CONFIG_LOONGSON3V', if_true: files('loongson3_bootp.c', 'loon
|
||||||
mips_ss.add(when: 'CONFIG_MALTA', if_true: files('malta.c'))
|
mips_ss.add(when: 'CONFIG_MALTA', if_true: files('malta.c'))
|
||||||
mips_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('cps.c'))
|
mips_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('cps.c'))
|
||||||
|
|
||||||
if 'CONFIG_TCG' in config_all
|
if 'CONFIG_TCG' in config_all_accel
|
||||||
mips_ss.add(when: 'CONFIG_JAZZ', if_true: files('jazz.c'))
|
mips_ss.add(when: 'CONFIG_JAZZ', if_true: files('jazz.c'))
|
||||||
mips_ss.add(when: 'CONFIG_MIPSSIM', if_true: files('mipssim.c'))
|
mips_ss.add(when: 'CONFIG_MIPSSIM', if_true: files('mipssim.c'))
|
||||||
mips_ss.add(when: 'CONFIG_FULOONG', if_true: files('fuloong2e.c'))
|
mips_ss.add(when: 'CONFIG_FULOONG', if_true: files('fuloong2e.c'))
|
||||||
|
|
16
meson.build
16
meson.build
|
@ -2886,7 +2886,7 @@ endif
|
||||||
|
|
||||||
minikconf = find_program('scripts/minikconf.py')
|
minikconf = find_program('scripts/minikconf.py')
|
||||||
|
|
||||||
config_all = {}
|
config_all_accel = {}
|
||||||
config_all_devices = {}
|
config_all_devices = {}
|
||||||
config_devices_mak_list = []
|
config_devices_mak_list = []
|
||||||
config_devices_h = {}
|
config_devices_h = {}
|
||||||
|
@ -2974,7 +2974,7 @@ foreach target : target_dirs
|
||||||
foreach sym: accelerators
|
foreach sym: accelerators
|
||||||
if sym == 'CONFIG_TCG' or target in accelerator_targets.get(sym, [])
|
if sym == 'CONFIG_TCG' or target in accelerator_targets.get(sym, [])
|
||||||
config_target += { sym: 'y' }
|
config_target += { sym: 'y' }
|
||||||
config_all += { sym: 'y' }
|
config_all_accel += { sym: 'y' }
|
||||||
if target in modular_tcg
|
if target in modular_tcg
|
||||||
config_target += { 'CONFIG_TCG_MODULAR': 'y' }
|
config_target += { 'CONFIG_TCG_MODULAR': 'y' }
|
||||||
else
|
else
|
||||||
|
@ -4204,18 +4204,18 @@ endif
|
||||||
# Targets and accelerators
|
# Targets and accelerators
|
||||||
summary_info = {}
|
summary_info = {}
|
||||||
if have_system
|
if have_system
|
||||||
summary_info += {'KVM support': config_all.has_key('CONFIG_KVM')}
|
summary_info += {'KVM support': config_all_accel.has_key('CONFIG_KVM')}
|
||||||
summary_info += {'HVF support': config_all.has_key('CONFIG_HVF')}
|
summary_info += {'HVF support': config_all_accel.has_key('CONFIG_HVF')}
|
||||||
summary_info += {'WHPX support': config_all.has_key('CONFIG_WHPX')}
|
summary_info += {'WHPX support': config_all_accel.has_key('CONFIG_WHPX')}
|
||||||
summary_info += {'NVMM support': config_all.has_key('CONFIG_NVMM')}
|
summary_info += {'NVMM support': config_all_accel.has_key('CONFIG_NVMM')}
|
||||||
summary_info += {'Xen support': xen.found()}
|
summary_info += {'Xen support': xen.found()}
|
||||||
if xen.found()
|
if xen.found()
|
||||||
summary_info += {'xen ctrl version': xen.version()}
|
summary_info += {'xen ctrl version': xen.version()}
|
||||||
endif
|
endif
|
||||||
summary_info += {'Xen emulation': config_all_devices.has_key('CONFIG_XEN_EMU')}
|
summary_info += {'Xen emulation': config_all_devices.has_key('CONFIG_XEN_EMU')}
|
||||||
endif
|
endif
|
||||||
summary_info += {'TCG support': config_all.has_key('CONFIG_TCG')}
|
summary_info += {'TCG support': config_all_accel.has_key('CONFIG_TCG')}
|
||||||
if config_all.has_key('CONFIG_TCG')
|
if config_all_accel.has_key('CONFIG_TCG')
|
||||||
if get_option('tcg_interpreter')
|
if get_option('tcg_interpreter')
|
||||||
summary_info += {'TCG backend': 'TCI (TCG with bytecode interpreter, slow)'}
|
summary_info += {'TCG backend': 'TCI (TCG with bytecode interpreter, slow)'}
|
||||||
else
|
else
|
||||||
|
|
|
@ -28,7 +28,7 @@ arm_system_ss.add(files(
|
||||||
|
|
||||||
subdir('hvf')
|
subdir('hvf')
|
||||||
|
|
||||||
if 'CONFIG_TCG' in config_all
|
if 'CONFIG_TCG' in config_all_accel
|
||||||
subdir('tcg')
|
subdir('tcg')
|
||||||
else
|
else
|
||||||
arm_ss.add(files('tcg-stubs.c'))
|
arm_ss.add(files('tcg-stubs.c'))
|
||||||
|
|
|
@ -12,7 +12,7 @@ if have_system
|
||||||
subdir('sysemu')
|
subdir('sysemu')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if 'CONFIG_TCG' in config_all
|
if 'CONFIG_TCG' in config_all_accel
|
||||||
subdir('tcg')
|
subdir('tcg')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
if 'CONFIG_TCG' not in config_all
|
if 'CONFIG_TCG' not in config_all_accel
|
||||||
subdir_done()
|
subdir_done()
|
||||||
endif
|
endif
|
||||||
# There are namespace pollution issues on Windows, due to osdep.h
|
# There are namespace pollution issues on Windows, due to osdep.h
|
||||||
|
|
|
@ -76,7 +76,7 @@ endif
|
||||||
|
|
||||||
subdir('decode')
|
subdir('decode')
|
||||||
|
|
||||||
if 'CONFIG_TCG' in config_all
|
if 'CONFIG_TCG' in config_all_accel
|
||||||
subdir('fp')
|
subdir('fp')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -155,8 +155,8 @@ qtests_ppc = \
|
||||||
qtests_filter + \
|
qtests_filter + \
|
||||||
(config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : []) + \
|
(config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : []) + \
|
||||||
(config_all_devices.has_key('CONFIG_M48T59') ? ['m48t59-test'] : []) + \
|
(config_all_devices.has_key('CONFIG_M48T59') ? ['m48t59-test'] : []) + \
|
||||||
(config_all.has_key('CONFIG_TCG') ? ['prom-env-test'] : []) + \
|
(config_all_accel.has_key('CONFIG_TCG') ? ['prom-env-test'] : []) + \
|
||||||
(config_all.has_key('CONFIG_TCG') ? ['boot-serial-test'] : []) + \
|
(config_all_accel.has_key('CONFIG_TCG') ? ['boot-serial-test'] : []) + \
|
||||||
['boot-order-test']
|
['boot-order-test']
|
||||||
|
|
||||||
qtests_ppc64 = \
|
qtests_ppc64 = \
|
||||||
|
@ -213,12 +213,12 @@ qtests_arm = \
|
||||||
# TODO: once aarch64 TCG is fixed on ARM 32 bit host, make bios-tables-test unconditional
|
# TODO: once aarch64 TCG is fixed on ARM 32 bit host, make bios-tables-test unconditional
|
||||||
qtests_aarch64 = \
|
qtests_aarch64 = \
|
||||||
(cpu != 'arm' and unpack_edk2_blobs ? ['bios-tables-test'] : []) + \
|
(cpu != 'arm' and unpack_edk2_blobs ? ['bios-tables-test'] : []) + \
|
||||||
(config_all.has_key('CONFIG_TCG') and config_all_devices.has_key('CONFIG_TPM_TIS_SYSBUS') ? \
|
(config_all_accel.has_key('CONFIG_TCG') and config_all_devices.has_key('CONFIG_TPM_TIS_SYSBUS') ? \
|
||||||
['tpm-tis-device-test', 'tpm-tis-device-swtpm-test'] : []) + \
|
['tpm-tis-device-test', 'tpm-tis-device-swtpm-test'] : []) + \
|
||||||
(config_all_devices.has_key('CONFIG_XLNX_ZYNQMP_ARM') ? ['xlnx-can-test', 'fuzz-xlnx-dp-test'] : []) + \
|
(config_all_devices.has_key('CONFIG_XLNX_ZYNQMP_ARM') ? ['xlnx-can-test', 'fuzz-xlnx-dp-test'] : []) + \
|
||||||
(config_all_devices.has_key('CONFIG_XLNX_VERSAL') ? ['xlnx-canfd-test', 'xlnx-versal-trng-test'] : []) + \
|
(config_all_devices.has_key('CONFIG_XLNX_VERSAL') ? ['xlnx-canfd-test', 'xlnx-versal-trng-test'] : []) + \
|
||||||
(config_all_devices.has_key('CONFIG_RASPI') ? ['bcm2835-dma-test'] : []) + \
|
(config_all_devices.has_key('CONFIG_RASPI') ? ['bcm2835-dma-test'] : []) + \
|
||||||
(config_all.has_key('CONFIG_TCG') and \
|
(config_all_accel.has_key('CONFIG_TCG') and \
|
||||||
config_all_devices.has_key('CONFIG_TPM_TIS_I2C') ? ['tpm-tis-i2c-test'] : []) + \
|
config_all_devices.has_key('CONFIG_TPM_TIS_I2C') ? ['tpm-tis-i2c-test'] : []) + \
|
||||||
['arm-cpu-features',
|
['arm-cpu-features',
|
||||||
'numa-test',
|
'numa-test',
|
||||||
|
|
Loading…
Reference in a new issue