Merge pull request kata-containers#3030 from likebreath/1104/dbg_vfio…

…_qemu_virtiofs ci: vfio: Enable vfio test with qemu-virtiofs
devimc · Nov 6, 2020 · de38d8d · de38d8d
2 parents e10d723 + 5f411ed
commit de38d8d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/Makefile b/Makefile
@@ -336,6 +336,8 @@ vcpus:
 	bash -f integration/vcpus/default_vcpus_test.sh
 
 vfio:
+	bash -f functional/vfio/run.sh -s false -p qemu-virtiofs -i image
+	bash -f functional/vfio/run.sh -s true -p qemu-virtiofs -i image
 	bash -f functional/vfio/run.sh -s false -p clh -i image
 	bash -f functional/vfio/run.sh -s true -p clh -i image
 #   bash -f functional/vfio/run.sh -s false -p clh -i initrd

diff --git a/functional/vfio/run.sh b/functional/vfio/run.sh
@@ -109,6 +109,7 @@ EOF
 
 setup_configuration_file() {
 	local qemu_config_file="configuration-qemu.toml"
+	local qemu_virtiofs_config_file="configuration-qemu-virtiofs.toml"
 	local clh_config_file="configuration-clh.toml"
 	local image_file="/usr/share/kata-containers/kata-containers.img"
 	local initrd_file="/usr/share/kata-containers/kata-containers-initrd.img"
@@ -119,6 +120,8 @@ setup_configuration_file() {
 
 		if [ "$HYPERVISOR" = "qemu" ]; then
 			config_filename="${qemu_config_file}"
+		elif [ "$HYPERVISOR" = "qemu-virtiofs" ]; then
+			config_filename="${qemu_virtiofs_config_file}"
 		elif [ "$HYPERVISOR" = "clh" ]; then
 			config_filename="${clh_config_file}"
 		fi