[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 01/20] meson: do not use CONFIG_VIRTFS
From: |
Paolo Bonzini |
Subject: |
[PULL 01/20] meson: do not use CONFIG_VIRTFS |
Date: |
Tue, 12 Jan 2021 18:14:31 +0100 |
CONFIG_VIRTFS is not anymore part of the config_host dictionary.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
fsdev/meson.build | 2 +-
tests/qtest/meson.build | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/fsdev/meson.build b/fsdev/meson.build
index 7dd1cc9bfb..65455a179e 100644
--- a/fsdev/meson.build
+++ b/fsdev/meson.build
@@ -8,7 +8,7 @@ fsdev_ss.add(when: ['CONFIG_FSDEV_9P'], if_true: files(
), if_false: files('qemu-fsdev-dummy.c'))
softmmu_ss.add_all(when: 'CONFIG_LINUX', if_true: fsdev_ss)
-have_virtfs_proxy_helper = have_tools and libattr.found() and
libcap_ng.found() and 'CONFIG_VIRTFS' in config_host
+have_virtfs_proxy_helper = have_tools and libattr.found() and
libcap_ng.found() and have_virtfs
if have_virtfs_proxy_helper
executable('virtfs-proxy-helper',
files('virtfs-proxy-helper.c', '9p-marshal.c',
'9p-iov-marshal.c'),
diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
index 6a67c538be..6ec09821d7 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -199,7 +199,9 @@ qos_test_ss.add(
'virtio-serial-test.c',
'vmxnet3-test.c',
)
-qos_test_ss.add(when: 'CONFIG_VIRTFS', if_true: files('virtio-9p-test.c'))
+if have_virtfs
+ qos_test_ss.add(files('virtio-9p-test.c'))
+endif
qos_test_ss.add(when: 'CONFIG_VHOST_USER', if_true: files('vhost-user-test.c'))
tpmemu_files = ['tpm-emu.c', 'tpm-util.c', 'tpm-tests.c']
--
2.29.2
- [PULL 00/20] Misc patches for 2021-01-12, Paolo Bonzini, 2021/01/12
- [PULL 01/20] meson: do not use CONFIG_VIRTFS,
Paolo Bonzini <=
- [PULL 07/20] whpx: move whpx_lapic_state from header to c file, Paolo Bonzini, 2021/01/12
- [PULL 02/20] whpx: rename whp-dispatch to whpx-internal.h, Paolo Bonzini, 2021/01/12
- [PULL 06/20] maintainers: Add me as Windows Hosted Continuous Integration maintainer, Paolo Bonzini, 2021/01/12
- [PULL 04/20] cirrus/msys2: Exit powershell with $LastExitCode, Paolo Bonzini, 2021/01/12
- [PULL 03/20] whpx: move internal definitions to whpx-internal.h, Paolo Bonzini, 2021/01/12
- [PULL 18/20] configure: move Cocoa incompatibility checks to Meson, Paolo Bonzini, 2021/01/12
- [PULL 20/20] target/i386: Use X86Seg enum for segment registers, Paolo Bonzini, 2021/01/12
- [PULL 05/20] cirrus/msys2: Cache msys2 mingw in a better way., Paolo Bonzini, 2021/01/12
- [PULL 09/20] scripts/gdb: fix 'qemu coroutine' when users selects a non topmost stack frame, Paolo Bonzini, 2021/01/12
- [PULL 08/20] meson: fix Cocoa option in summary, Paolo Bonzini, 2021/01/12