From cf4835e3ae78d729ec642828c69a713857a34d29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Wed, 27 Dec 2023 15:04:11 -0300 Subject: [PATCH] packaging: qemu: Simplify "--disable-virtiofsd" logic MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As all the supported architectures are disabling the virtiofsd build, there's no need to keep the switch statement there. Signed-off-by: Fabiano Fidêncio --- .../packaging/qemu/patches/8.1.x/no_patches.txt | 0 .../no_patches.txt | 0 tools/packaging/scripts/configure-hypervisor.sh | 17 +---------------- 3 files changed, 1 insertion(+), 16 deletions(-) create mode 100644 tools/packaging/qemu/patches/8.1.x/no_patches.txt create mode 100644 tools/packaging/qemu/patches/tag_patches/tdx-qemu-upstream-2023.9.21-v8.1.0/no_patches.txt diff --git a/tools/packaging/qemu/patches/8.1.x/no_patches.txt b/tools/packaging/qemu/patches/8.1.x/no_patches.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tools/packaging/qemu/patches/tag_patches/tdx-qemu-upstream-2023.9.21-v8.1.0/no_patches.txt b/tools/packaging/qemu/patches/tag_patches/tdx-qemu-upstream-2023.9.21-v8.1.0/no_patches.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tools/packaging/scripts/configure-hypervisor.sh b/tools/packaging/scripts/configure-hypervisor.sh index 8bdfc94de1..2f54921a14 100755 --- a/tools/packaging/scripts/configure-hypervisor.sh +++ b/tools/packaging/scripts/configure-hypervisor.sh @@ -331,22 +331,7 @@ generate_qemu_options() { # From Kata Containers 2.5.0-alpha2 all arches but powerpc have been # using the new implementation of virtiofs daemon, which is not part # of QEMU. - # For the power, at least for now, keep building virtiofsd while - # building QEMU. - case "$arch" in - aarch64) - qemu_options+=(functionality:--disable-virtiofsd) - ;; - x86_64) - qemu_options+=(functionality:--disable-virtiofsd) - ;; - ppc64le) - qemu_options+=(functionality:--disable-virtiofsd) - ;; - s390x) - qemu_options+=(functionality:--disable-virtiofsd) - ;; - esac + qemu_options+=(functionality:--disable-virtiofsd) qemu_options+=(functionality:--enable-virtfs)