diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2021-01-07 15:57:18 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-01-12 12:38:03 +0100 |
| commit | 2c9dce0196883d76e8bcb7142b26ab7587ff3006 (patch) | |
| tree | b1afeaa0973fafc49d4be850fc5ed7430bb26e6d | |
| parent | b3f846c59d8405bb87c551187721fc92ff2f1b92 (diff) | |
| download | qemu-2c9dce0196883d76e8bcb7142b26ab7587ff3006.zip | |
meson: do not use CONFIG_VIRTFS
CONFIG_VIRTFS is not anymore part of the config_host dictionary.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | fsdev/meson.build | 2 | ||||
| -rw-r--r-- | 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'] |