[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 12/34] meson: move CONFIG_XEN_PCI_PASSTHROUGH to config-host.h
From: |
Paolo Bonzini |
Subject: |
[PATCH 12/34] meson: move CONFIG_XEN_PCI_PASSTHROUGH to config-host.h |
Date: |
Wed, 20 Apr 2022 17:33:45 +0200 |
CONFIG_XEN_PCI_PASSTHROUGH is just a global configuration option; the selection
of the actual files in hw/xen/meson.build is also conditional on CONFIG_XEN,
so there is no need to put CONFIG_XEN_PCI_PASSTHROUGH in config-target.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 | 3 +--
2 files changed, 13 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 b8046efcf1..84156df809 100644
--- a/meson.build
+++ b/meson.build
@@ -1627,6 +1627,7 @@ config_host_data.set('CONFIG_X11', x11.found())
config_host_data.set('CONFIG_DBUS_DISPLAY', dbus_display)
config_host_data.set('CONFIG_CFI', get_option('cfi'))
config_host_data.set('CONFIG_SELINUX', selinux.found())
+config_host_data.set('CONFIG_XEN_PCI_PASSTHROUGH', have_xen_pci_passthrough)
config_host_data.set('QEMU_VERSION', '"@0@"'.format(meson.project_version()))
config_host_data.set('QEMU_VERSION_MAJOR',
meson.project_version().split('.')[0])
config_host_data.set('QEMU_VERSION_MINOR',
meson.project_version().split('.')[1])
@@ -2228,8 +2229,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
- Re: [PATCH 06/34] configure: move --enable/--disable-debug-info to second option parsing pass, (continued)
- [PATCH 09/34] meson, configure: move keyctl test to meson, Paolo Bonzini, 2022/04/20
- [PATCH 10/34] meson, configure: move usbfs test to meson, Paolo Bonzini, 2022/04/20
- [PATCH 08/34] meson, configure: move RDMA options to meson, Paolo Bonzini, 2022/04/20
- [PATCH 18/34] configure: switch string options to automatic parsing, Paolo Bonzini, 2022/04/20
- [PATCH 12/34] meson: move CONFIG_XEN_PCI_PASSTHROUGH to config-host.h,
Paolo Bonzini <=
- [PATCH 14/34] meson, configure: move Xen detection to meson, Paolo Bonzini, 2022/04/20
- [PATCH 13/34] meson, configure: move --enable-module-upgrades to meson, Paolo Bonzini, 2022/04/20
- [PATCH 07/34] configure, meson: move OpenGL check to meson, Paolo Bonzini, 2022/04/20
- [PATCH 11/34] meson, configure: move libgio test to meson, Paolo Bonzini, 2022/04/20
- [PATCH 15/34] meson-buildoptions: add support for string options, Paolo Bonzini, 2022/04/20