diff --git a/kata-containers.spec b/kata-containers.spec index 396ca744bf149fa721d37f95d016bae2b553345c..c7b3ae10bb417b70118b0ebdb05bd27443dfd2e2 100644 --- a/kata-containers.spec +++ b/kata-containers.spec @@ -2,7 +2,7 @@ %global debug_package %{nil} %define VERSION 2.1.0 -%define RELEASE 27 +%define RELEASE 28 Name: kata-containers Version: %{VERSION} @@ -108,6 +108,12 @@ strip %{buildroot}/usr/bin/containerd-shim-kata-v2 %doc %changelog +* Tue Aug 23 2022 chengzeruizhi - 2.1.0-28 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:add explicit on for kernel_irqchip + * Mon Aug 22 2022 chengzeruizhi - 2.1.0-27 - Type:bugfix - ID:NA diff --git a/patches/0031-add-explicit-on-after-kernel_irqchip.patch b/patches/0031-add-explicit-on-after-kernel_irqchip.patch new file mode 100644 index 0000000000000000000000000000000000000000..b27f444c23b85bcefc279b1d4016257e429ec83a --- /dev/null +++ b/patches/0031-add-explicit-on-after-kernel_irqchip.patch @@ -0,0 +1,33 @@ +From 0c9c5ca20b6aeae5e550decfd3540b389fb02cb5 Mon Sep 17 00:00:00 2001 +From: chengzrz +Date: Tue, 23 Aug 2022 15:30:05 +0800 +Subject: [PATCH] add explicit on after kernel_irqchip +Kata uses the 'kernel_irqchip' machine option to qemu. By default it +uses it in what qemu calls the "short-form boolean" with no parameter. +That style was deprecated by qemu between 5.2 and 6.0 (commit +ccd3b3b8112b) and effectively removed entirely between 6.0 and 6.1 +(commit d8fb7d0969d5). + +reference:https://github.com/kata-containers/kata-containers/commit/316509566966e4c9b3fd9ba3521554b384fdbf88 + +Signed-off-by: chengzrz +--- + src/runtime/virtcontainers/qemu_amd64.go | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/runtime/virtcontainers/qemu_amd64.go b/src/runtime/virtcontainers/qemu_amd64.go +index 1a045fae0..bc598c653 100644 +--- a/src/runtime/virtcontainers/qemu_amd64.go ++++ b/src/runtime/virtcontainers/qemu_amd64.go +@@ -27,7 +27,7 @@ const ( + + defaultQemuMachineType = QemuPC + +- defaultQemuMachineOptions = "accel=kvm,kernel_irqchip" ++ defaultQemuMachineOptions = "accel=kvm,kernel_irqchip=on" + + qmpMigrationWaitTimeout = 5 * time.Second + ) +-- +2.25.1 + diff --git a/series.conf b/series.conf index 82b4a6a0c3e54cabf68a9fe31d684a80fbc03ef9..5ce25b2f731d18699ba3538c689852e93e8b0321 100644 --- a/series.conf +++ b/series.conf @@ -28,3 +28,4 @@ 0028-stratovirt-provide-a-way-to-dynomically-obtain-firmw.patch 0029-stratovirt-fix-the-problem-that-add-more-than-16-roo.patch 0030-use-host_device-blockdev-adding.patch +0031-add-explicit-on-after-kernel_irqchip.patch