mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-09-18 07:18:27 +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>
66 lines
2.8 KiB
Diff
66 lines
2.8 KiB
Diff
From 22b6a14e0b56989e4ac68377eb1cff7c404e14ae Mon Sep 17 00:00:00 2001
|
|
From: Halil Pasic <pasic@linux.ibm.com>
|
|
Date: Thu, 18 Feb 2021 04:40:59 +0100
|
|
Subject: [PATCH] hw/s390x: fix build for virtio-9p-ccw
|
|
|
|
Commit 2c44220d05 ("meson: convert hw/arch*"), which migrated the old
|
|
Makefile.objs to meson.build accidentally excluded virtio-ccw-9p.c and
|
|
thus the virtio-9p-ccw device from the build (and potentially also
|
|
included the file virtio-ccw-blk.c twice in the source set). And since
|
|
CONFIG_VIRTFS can't be used the way it was used here (see commit
|
|
2c9dce0196 ("meson: do not use CONFIG_VIRTFS")), the preconditions have
|
|
to be written differently.
|
|
|
|
Let's fix this!
|
|
|
|
Signed-off-by: Halil Pasic <pasic@linux.ibm.com>
|
|
Fixes: 2c44220d05 ("meson: convert hw/arch*")
|
|
Reported-by: Jakob Naucke <jakob.naucke@ibm.com>
|
|
Cc: qemu-stable@nongnu.org
|
|
|
|
X-Backport-Note: add the definition of have_virtfs from 69202b406e3
|
|
Origin: backport, https://lists.nongnu.org/archive/html/qemu-devel/2021-02/msg05793.html
|
|
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1916230
|
|
Last-Update: 2021-02-22
|
|
|
|
Cherry picked from https://git.launchpad.net/ubuntu/+source/qemu/plain/debian/patches/ubuntu/lp-1916230-hw-s390x-fix-build-for-virtio-9p-ccw.patch?id=e4d879c593bc0f3758248de4e2b4087d9f5dfc7e
|
|
---
|
|
hw/s390x/meson.build | 4 +++-
|
|
meson.build | 5 +++++
|
|
2 files changed, 8 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/hw/s390x/meson.build b/hw/s390x/meson.build
|
|
index 2a7818d94b..91495b5631 100644
|
|
--- a/hw/s390x/meson.build
|
|
+++ b/hw/s390x/meson.build
|
|
@@ -40,7 +40,9 @@ virtio_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('virtio-ccw-net.c'))
|
|
virtio_ss.add(when: 'CONFIG_VIRTIO_RNG', if_true: files('virtio-ccw-rng.c'))
|
|
virtio_ss.add(when: 'CONFIG_VIRTIO_SCSI', if_true: files('virtio-ccw-scsi.c'))
|
|
virtio_ss.add(when: 'CONFIG_VIRTIO_SERIAL', if_true: files('virtio-ccw-serial.c'))
|
|
-virtio_ss.add(when: ['CONFIG_VIRTIO_9P', 'CONFIG_VIRTFS'], if_true: files('virtio-ccw-blk.c'))
|
|
+if have_virtfs
|
|
+ virtio_ss.add(when: 'CONFIG_VIRTIO_9P', if_true: files('virtio-ccw-9p.c'))
|
|
+endif
|
|
virtio_ss.add(when: 'CONFIG_VHOST_VSOCK', if_true: files('vhost-vsock-ccw.c'))
|
|
virtio_ss.add(when: 'CONFIG_VHOST_USER_FS', if_true: files('vhost-user-fs-ccw.c'))
|
|
s390x_ss.add_all(when: 'CONFIG_VIRTIO_CCW', if_true: virtio_ss)
|
|
diff --git a/meson.build b/meson.build
|
|
index e3386196ba..fcfe4fc0b9 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -777,6 +777,11 @@ endif
|
|
# config-host.h #
|
|
#################
|
|
|
|
+have_virtfs = (targetos == 'linux' and
|
|
+ have_system and
|
|
+ libattr.found() and
|
|
+ libcap_ng.found())
|
|
+
|
|
config_host_data.set_quoted('CONFIG_BINDIR', get_option('prefix') / get_option('bindir'))
|
|
config_host_data.set_quoted('CONFIG_PREFIX', get_option('prefix'))
|
|
config_host_data.set_quoted('CONFIG_QEMU_CONFDIR', get_option('prefix') / qemu_confdir)
|
|
--
|
|
2.26.2
|
|
|