[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 16/18] meson: remove CONFIG_XEN_PCI_PASSTHROUGH from config-target
From: |
Paolo Bonzini |
Subject: |
[PULL 16/18] meson: remove CONFIG_XEN_PCI_PASSTHROUGH from config-target.h |
Date: |
Thu, 28 Apr 2022 08:53:33 +0200 |
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>
---
hw/xen/meson.build | 20 ++++++++++++--------
meson.build | 2 --
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/hw/xen/meson.build b/hw/xen/meson.build
index 076954b89c..08dc1f6857 100644
--- a/hw/xen/meson.build
+++ b/hw/xen/meson.build
@@ -8,13 +8,17 @@ softmmu_ss.add(when: ['CONFIG_XEN', xen], if_true: files(
))
xen_specific_ss = ss.source_set()
-xen_specific_ss.add(when: 'CONFIG_XEN_PCI_PASSTHROUGH', if_true: files(
- 'xen-host-pci-device.c',
- 'xen_pt.c',
- 'xen_pt_config_init.c',
- 'xen_pt_graphics.c',
- 'xen_pt_load_rom.c',
- 'xen_pt_msi.c',
-), if_false: files('xen_pt_stub.c'))
+if have_xen_pci_passthrough
+ xen_specific_ss.add(files(
+ 'xen-host-pci-device.c',
+ 'xen_pt.c',
+ 'xen_pt_config_init.c',
+ 'xen_pt_graphics.c',
+ 'xen_pt_load_rom.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)
diff --git a/meson.build b/meson.build
index 9f2a12e1cf..ab1ac9b959 100644
--- a/meson.build
+++ b/meson.build
@@ -2242,8 +2242,6 @@ foreach target : target_dirs
config_all += { sym: 'y' }
if sym == 'CONFIG_TCG' and tcg_arch == 'tci'
config_target += { 'CONFIG_TCG_INTERPRETER': 'y' }
- elif sym == 'CONFIG_XEN' and have_xen_pci_passthrough
- config_target += { 'CONFIG_XEN_PCI_PASSTHROUGH': 'y' }
endif
if target in modular_tcg
config_target += { 'CONFIG_TCG_MODULAR': 'y' }
--
2.35.1
- [PULL 07/18] qga: wixl: get path to sysroot from pkg-config as intended, (continued)
- [PULL 07/18] qga: wixl: get path to sysroot from pkg-config as intended, Paolo Bonzini, 2022/04/28
- [PULL 09/18] configure: gcov should not exclude fortify-source, Paolo Bonzini, 2022/04/28
- [PULL 10/18] configure: move --enable/--disable-debug-info to second option parsing pass, Paolo Bonzini, 2022/04/28
- [PULL 02/18] configure: make fortify_source=yes by default, Paolo Bonzini, 2022/04/28
- [PULL 04/18] i386: pcmpestr 64-bit sign extension bug, Paolo Bonzini, 2022/04/28
- [PULL 05/18] meson: show final set of compiler flags, Paolo Bonzini, 2022/04/28
- [PULL 06/18] configure: remove dead code, Paolo Bonzini, 2022/04/28
- [PULL 08/18] configure: pc-bios/qemu-icon.bmp does not exist, Paolo Bonzini, 2022/04/28
- [PULL 14/18] meson, configure: move usbfs test to meson, Paolo Bonzini, 2022/04/28
- [PULL 12/18] meson, configure: move RDMA options to meson, Paolo Bonzini, 2022/04/28
- [PULL 16/18] meson: remove CONFIG_XEN_PCI_PASSTHROUGH from config-target.h,
Paolo Bonzini <=
- [PULL 18/18] qemu-options: Limit the -enable-kvm option to the targets that support it, Paolo Bonzini, 2022/04/28
- [PULL 15/18] meson, configure: move libgio test to meson, Paolo Bonzini, 2022/04/28
- [PULL 17/18] meson, configure: move --enable-module-upgrades to meson, Paolo Bonzini, 2022/04/28
- [PULL 11/18] configure, meson: move OpenGL check to meson, Paolo Bonzini, 2022/04/28
- [PULL 13/18] meson, configure: move keyctl test to meson, Paolo Bonzini, 2022/04/28
- Re: [PULL 00/18] Misc QEMU patches for 2022-04-28, Richard Henderson, 2022/04/28