mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-07-01 01:33:20 +00:00
88cef33b76
This change the version of QEMU used in the tests and CI.
The scripts/configure-hypervisor.sh was changed so that:
- Passing the `--enable-virtiofsd` flag
- Do not compiling with -O3 to avoid the warning:
Program python3 found: YES (/usr/bin/python3)
../meson.build:104: WARNING: Consider using the built-in optimization level instead of using "-O3".
../meson.build:108: WARNING: Consider using the built-in optimization level instead of using "-O3".
The qemu.blacklist files was changed so that new and uneeded firmware files are removed from the
final tarball. Except for qboot.rom which is new but kept, since it can be used with microvm
machine type (in case we want to enable microvm in the future).
The patches which are applied on QEMU sources:
- 0001-virtiofsd-Allow-to-build-it-without-the-tools.patch
(Build fix for Meson - allows passing `--disable-tools --enable-virtiofsd`)
- 0002-virtiofsd-extract-lo_do_open-from-lo_open.patch
0003-virtiofsd-optionally-return-inode-pointer-from-lo_do.patch
0004-virtiofsd-prevent-opening-of-special-files-CVE-2020-.patch
0005-virtiofsd-Add-_llseek-to-the-seccomp-whitelist.patch
0006-virtiofsd-Add-restart_syscall-to-the-seccomp-whiteli.patch
(Security fixes for virtiofsd)
- 0007-9p-removing-coroutines-of-9p-to-increase-the-I-O-per.patch
(Performance improvement for 9p driver)
- 0008-hw-s390x-fix-build-for-virtio-9p-ccw.patch
(Build fix for virtio-9p-ccw machine type)
Fixes: #1238
Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
37 lines
1.3 KiB
Diff
37 lines
1.3 KiB
Diff
From a369195f7fb111a55617ff14aac4c8d87f3b996f Mon Sep 17 00:00:00 2001
|
|
From: Wainer dos Santos Moschetta <wainersm@redhat.com>
|
|
Date: Tue, 2 Feb 2021 13:46:24 -0500
|
|
Subject: [PATCH] virtiofsd: Allow to build it without the tools
|
|
|
|
This changed the Meson build script to allow virtiofsd be built even
|
|
though the tools build is disabled, thus honoring the --enable-virtiofsd
|
|
option.
|
|
|
|
(Backport of commit xxxxxx)
|
|
Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
|
|
---
|
|
tools/meson.build | 7 +++++--
|
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/tools/meson.build b/tools/meson.build
|
|
index 76bf84df52..2a1d520127 100644
|
|
--- a/tools/meson.build
|
|
+++ b/tools/meson.build
|
|
@@ -10,8 +10,11 @@ if get_option('virtiofsd').enabled()
|
|
error('virtiofsd requires Linux')
|
|
elif 'CONFIG_SECCOMP' not in config_host or 'CONFIG_LIBCAP_NG' not in config_host
|
|
error('virtiofsd requires libcap-ng-devel and seccomp-devel')
|
|
- elif not have_tools or 'CONFIG_VHOST_USER' not in config_host
|
|
- error('virtiofsd needs tools and vhost-user support')
|
|
+ elif 'CONFIG_VHOST_USER' not in config_host
|
|
+ error('virtiofsd needs vhost-user support')
|
|
+ else
|
|
+ # Disabled all the tools but virtiofsd.
|
|
+ have_virtiofsd = true
|
|
endif
|
|
endif
|
|
elif get_option('virtiofsd').disabled() or not have_system
|
|
--
|
|
2.26.2
|
|
|