summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorBin Meng <bin.meng@windriver.com>2022-10-28 12:57:33 +0800
committerThomas Huth <thuth@redhat.com>2022-10-28 14:32:09 +0200
commit8aff9c3279087b8527fd2c3dd4cf0706892887ba (patch)
tree4cc177d82525b6255454f73bfc0a5b5019d1fdbd
parentf2d063e61ee2026700ab44bef967f663e976bec8 (diff)
downloadfocaccia-qemu-8aff9c3279087b8527fd2c3dd4cf0706892887ba.tar.gz
focaccia-qemu-8aff9c3279087b8527fd2c3dd4cf0706892887ba.zip
tests/qtest: libqos: Do not build virtio-9p unconditionally
At present the virtio-9p related codes are built into libqos
unconditionally. Change to build them conditionally by testing
the 'virtfs' config option.

Signed-off-by: Bin Meng <bin.meng@windriver.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20221028045736.679903-9-bin.meng@windriver.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
-rw-r--r--tests/qtest/libqos/meson.build6
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/qtest/libqos/meson.build b/tests/qtest/libqos/meson.build
index 113c80b4e4..32f028872c 100644
--- a/tests/qtest/libqos/meson.build
+++ b/tests/qtest/libqos/meson.build
@@ -33,8 +33,6 @@ libqos_srcs = files(
         'sdhci.c',
         'tpci200.c',
         'virtio.c',
-        'virtio-9p.c',
-        'virtio-9p-client.c',
         'virtio-balloon.c',
         'virtio-blk.c',
         'vhost-user-blk.c',
@@ -62,6 +60,10 @@ libqos_srcs = files(
         'x86_64_pc-machine.c',
 )
 
+if have_virtfs
+  libqos_srcs += files('virtio-9p.c', 'virtio-9p-client.c')
+endif
+
 libqos = static_library('qos', libqos_srcs + genh,
                         name_suffix: 'fa',
                         build_by_default: false)