OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

meson: remove CONFIG_XEN_PCI_PASSTHROUGH from config-target.h

Browse Source 
CONFIG_XEN_PCI_PASSTHROUGH is just a global configuration option;
it is never used in the source files, so there is no need to put
CONFIG_XEN_PCI_PASSTHROUGH in config-target.h or even in config-host.h.

This inaccuracy was copied over from the configure script in commit
8a19980e3f ("configure: move accelerator logic to meson", 2020-10-03).

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2022-04-20 17:33:45 +02:00
parent 7544060ef3
commit 215b00a542
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/xen/meson.build
View File

@ -8,13 +8,17 @@ softmmu_ss.add(when: ['CONFIG_XEN', xen], if_true: files(
)) ))
xen_specific_ss = ss.source_set() xen_specific_ss = ss.source_set()
xen_specific_ss.add(when: 'CONFIG_XEN_PCI_PASSTHROUGH', if_true: files( if have_xen_pci_passthrough
'xen-host-pci-device.c', xen_specific_ss.add(files(
'xen_pt.c', 'xen-host-pci-device.c',
'xen_pt_config_init.c', 'xen_pt.c',
'xen_pt_graphics.c', 'xen_pt_config_init.c',
'xen_pt_load_rom.c', 'xen_pt_graphics.c',
'xen_pt_msi.c', 'xen_pt_load_rom.c',
), if_false: files('xen_pt_stub.c')) 'xen_pt_msi.c',
))
else
xen_specific_ss.add('xen_pt_stub.c')
endif
specific_ss.add_all(when: ['CONFIG_XEN', xen], if_true: xen_specific_ss) specific_ss.add_all(when: ['CONFIG_XEN', xen], if_true: xen_specific_ss)

2
meson.build
View File

@ -2242,8 +2242,6 @@ foreach target : target_dirs
config_all += { sym: 'y' } config_all += { sym: 'y' }
if sym == 'CONFIG_TCG' and tcg_arch == 'tci' if sym == 'CONFIG_TCG' and tcg_arch == 'tci'
config_target += { 'CONFIG_TCG_INTERPRETER': 'y' } config_target += { 'CONFIG_TCG_INTERPRETER': 'y' }
elif sym == 'CONFIG_XEN' and have_xen_pci_passthrough
config_target += { 'CONFIG_XEN_PCI_PASSTHROUGH': 'y' }
endif endif
if target in modular_tcg if target in modular_tcg
config_target += { 'CONFIG_TCG_MODULAR': 'y' } config_target += { 'CONFIG_TCG_MODULAR': 'y' }