From d3c98620591f902fec9cc2abbe6f03f93122052d Mon Sep 17 00:00:00 2001 From: Eric Ernst Date: Wed, 14 Oct 2020 20:46:00 -0700 Subject: [PATCH] config: make virtio-fs part of standard kernel Basic virtio-fs support has made it upstream in the Linux kernel, as well as in QEMU and Cloud Hypervisor. Let's go ahead and add it to the standard configuration. Since the device driver / DAX handling is still in progress for upstream, we will want to still build a seperate experimental kernel for those who are comfortable trading off bleeding edge stability/kernel updates for improved FIO numbers. Fixes: #963 Signed-off-by: Eric Ernst --- .../configs/fragments/common/experimental/virtio-fs.conf | 3 --- tools/packaging/kernel/configs/fragments/common/fs.conf | 4 ++++ tools/packaging/kernel/kata_config_version | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) delete mode 100644 tools/packaging/kernel/configs/fragments/common/experimental/virtio-fs.conf diff --git a/tools/packaging/kernel/configs/fragments/common/experimental/virtio-fs.conf b/tools/packaging/kernel/configs/fragments/common/experimental/virtio-fs.conf deleted file mode 100644 index ed1810f135..0000000000 --- a/tools/packaging/kernel/configs/fragments/common/experimental/virtio-fs.conf +++ /dev/null @@ -1,3 +0,0 @@ -# virtio-fs support -CONFIG_VIRTIO_FS=y -CONFIG_FUSE_FS=y diff --git a/tools/packaging/kernel/configs/fragments/common/fs.conf b/tools/packaging/kernel/configs/fragments/common/fs.conf index 28d9019ee2..898091db9e 100644 --- a/tools/packaging/kernel/configs/fragments/common/fs.conf +++ b/tools/packaging/kernel/configs/fragments/common/fs.conf @@ -49,3 +49,7 @@ CONFIG_AIO=y CONFIG_OVERLAY_FS=y CONFIG_OVERLAY_FS_INDEX=y CONFIG_OVERLAY_FS_REDIRECT_DIR=y + +# virtio-fs driver support: +CONFIG_VIRTIO_FS=y +CONFIG_FUSE_FS=y diff --git a/tools/packaging/kernel/kata_config_version b/tools/packaging/kernel/kata_config_version index 76a8b2b703..871727de1f 100644 --- a/tools/packaging/kernel/kata_config_version +++ b/tools/packaging/kernel/kata_config_version @@ -1 +1 @@ -83 +84