From bca31d5a4dc274adce7ec1d47e1be6f4307b703e Mon Sep 17 00:00:00 2001 From: Hyounggyu Choi Date: Tue, 8 Jul 2025 10:47:18 +0200 Subject: [PATCH] runtime/runtime-rs: Set shared_fs to none for IBM SEL in config file In line with configuration for other TEEs, shared_fs should be set to none for IBM SEL. This commit updates the value for runtime/runtime-rs. Signed-off-by: Hyounggyu Choi --- src/runtime-rs/Makefile | 2 ++ src/runtime-rs/config/configuration-qemu-se-runtime-rs.toml.in | 2 +- src/runtime/Makefile | 2 ++ src/runtime/config/configuration-qemu-se.toml.in | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/runtime-rs/Makefile b/src/runtime-rs/Makefile index ea31c73716..86f022c4d1 100644 --- a/src/runtime-rs/Makefile +++ b/src/runtime-rs/Makefile @@ -317,6 +317,7 @@ endif DEFVCPUS_QEMU := 1 DEFMAXVCPUS_QEMU := 0 DEFSHAREDFS_QEMU_VIRTIOFS := virtio-fs + DEFSHAREDFS_QEMU_SEL_VIRTIOFS := none DEFBLOCKSTORAGEDRIVER_QEMU := virtio-scsi DEFBLOCKDEVICEAIO_QEMU := io_uring DEFNETWORKMODEL_QEMU := tcfilter @@ -472,6 +473,7 @@ USER_VARS += DEFBLOCKDEVICEAIO_QEMU USER_VARS += DEFBLOCKSTORAGEDRIVER_FC USER_VARS += DEFSHAREDFS_CLH_VIRTIOFS USER_VARS += DEFSHAREDFS_QEMU_VIRTIOFS +USER_VARS += DEFSHAREDFS_QEMU_SEL_VIRTIOFS USER_VARS += DEFVIRTIOFSDAEMON USER_VARS += DEFVALIDVIRTIOFSDAEMONPATHS USER_VARS += DEFVIRTIOFSCACHESIZE diff --git a/src/runtime-rs/config/configuration-qemu-se-runtime-rs.toml.in b/src/runtime-rs/config/configuration-qemu-se-runtime-rs.toml.in index d0934911de..def94de94a 100644 --- a/src/runtime-rs/config/configuration-qemu-se-runtime-rs.toml.in +++ b/src/runtime-rs/config/configuration-qemu-se-runtime-rs.toml.in @@ -170,7 +170,7 @@ disable_block_device_use = @DEFDISABLEBLOCK@ # - virtio-9p # - virtio-fs-nydus # - none -shared_fs = "@DEFSHAREDFS_QEMU_VIRTIOFS@" +shared_fs = "@DEFSHAREDFS_QEMU_SEL_VIRTIOFS@" # Path to vhost-user-fs daemon. virtio_fs_daemon = "@DEFVIRTIOFSDAEMON@" diff --git a/src/runtime/Makefile b/src/runtime/Makefile index 273364d267..96072082ef 100644 --- a/src/runtime/Makefile +++ b/src/runtime/Makefile @@ -244,6 +244,7 @@ DEFSHAREDFS_STRATOVIRT_VIRTIOFS := virtio-fs DEFSHAREDFS_QEMU_TDX_VIRTIOFS := none DEFSHAREDFS_QEMU_SEV_VIRTIOFS := none DEFSHAREDFS_QEMU_SNP_VIRTIOFS := none +DEFSHAREDFS_QEMU_SEL_VIRTIOFS := none DEFVIRTIOFSDAEMON := $(LIBEXECDIR)/virtiofsd DEFVALIDVIRTIOFSDAEMONPATHS := [\"$(DEFVIRTIOFSDAEMON)\"] # Default DAX mapping cache size in MiB @@ -730,6 +731,7 @@ USER_VARS += DEFSHAREDFS_STRATOVIRT_VIRTIOFS USER_VARS += DEFSHAREDFS_QEMU_TDX_VIRTIOFS USER_VARS += DEFSHAREDFS_QEMU_SEV_VIRTIOFS USER_VARS += DEFSHAREDFS_QEMU_SNP_VIRTIOFS +USER_VARS += DEFSHAREDFS_QEMU_SEL_VIRTIOFS USER_VARS += DEFVIRTIOFSDAEMON USER_VARS += DEFVALIDVIRTIOFSDAEMONPATHS USER_VARS += DEFVIRTIOFSCACHESIZE diff --git a/src/runtime/config/configuration-qemu-se.toml.in b/src/runtime/config/configuration-qemu-se.toml.in index fd41b8e02e..87800a20bb 100644 --- a/src/runtime/config/configuration-qemu-se.toml.in +++ b/src/runtime/config/configuration-qemu-se.toml.in @@ -164,7 +164,7 @@ disable_block_device_use = @DEFDISABLEBLOCK@ # - virtio-fs (default) # - virtio-9p # - virtio-fs-nydus -shared_fs = "@DEFSHAREDFS_QEMU_VIRTIOFS@" +shared_fs = "@DEFSHAREDFS_QEMU_SEL_VIRTIOFS@" # Path to vhost-user-fs daemon. virtio_fs_daemon = "@DEFVIRTIOFSDAEMON@"