!120 [sync] PR-119: kata-runtime:Remove kernel_irqchip option

From: @openeuler-sync-bot 
Reviewed-by: @jackchan8, @duguhaotian 
Signed-off-by: @duguhaotian

kata-containers.spec

@@ -2,7 +2,7 @@
 %global debug_package %{nil}
 
 %define VERSION 1.11.1
-%define RELEASE 25
+%define RELEASE 26
 
 Name:           kata-containers
 Version:        %{VERSION}
@@ -98,6 +98,12 @@ install -p -m 640 -D ./runtime/cli/config/configuration-qemu.toml %{buildroot}/u
 %doc
 
 %changelog
+* Thu Feb 02 2023 Vanient<xiadanni1@huawei.com> - 1.11.1-26
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:remove kernel_irqchip option for qemu 6.2
+
 * Thu Nov 17 2022 Vanient<xiadanni1@huawei.com> - 1.11.1-25
 - Type:bugfix
 - CVE:NA

runtime/patches/0098-kata-runtime-remove-kernel_irqchip-option.patch

@@ -0,0 +1,33 @@
+From eb576e014e3c3ce13898f1702817ef3e4d9709d9 Mon Sep 17 00:00:00 2001
+From: Vanient <xiadanni1@huawei.com>
+Date: Thu, 2 Feb 2023 15:47:11 +0800
+Subject: [PATCH] kata-runtime: remove kernel_irqchip option
+
+`kernel_irqchip` option doesn't seem to bring any benefits and, on the
+contrary, its usage cause issues when using the microvm machine type.
+
+With this in mind, let's remove it.
+
+upstream:https://github.com/kata-containers/kata-containers/commit/17de94e1187dd94d7e1b948c717ff0889b65fc11
+
+Signed-off-by: Vanient <xiadanni1@huawei.com>
+---
+ virtcontainers/qemu_amd64.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/virtcontainers/qemu_amd64.go b/virtcontainers/qemu_amd64.go
+index 1a5b266..7c52faf 100644
+--- a/virtcontainers/qemu_amd64.go
++++ b/virtcontainers/qemu_amd64.go
+@@ -25,7 +25,7 @@ const (
+ 
+ 	defaultQemuMachineType = QemuPC
+ 
+-	defaultQemuMachineOptions = "accel=kvm,kernel_irqchip"
++	defaultQemuMachineOptions = "accel=kvm"
+ 
+ 	qmpMigrationWaitTimeout = 5 * time.Second
+ )
+-- 
+2.27.0
+

runtime/series.conf

@@ -95,3 +95,4 @@
 0095-kata-runtime-fix-qemu-process-resource-resi.patch
 0096-kata-containers-Move-from-query-cpus-to-query-cpus-f.patch
 0097-kata-runtime-add-timeout-for-all-qmp-commands.patch
+0098-kata-runtime-remove-kernel_irqchip-option.patch