From 8e012faae115bd0337c394e8dba88a880d2b3a17 Mon Sep 17 00:00:00 2001
From: jikui <jikui2@huawei.com>
Date: Fri, 5 Nov 2021 17:57:23 +0800
Subject: [PATCH] kata-containers: fix kata-runtime hungs when qemu process is
 D/T

reason:fix kata-runtime hungs when qemu process is D/T

Signed-off-by: jikui <jikui2@huawei.com>
---
 kata-containers.spec                          |  8 +++++-
 ...-kata-runtime-hungs-when-qemu-proces.patch | 27 +++++++++++++++++++
 series.conf                                   |  1 +
 3 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 patches/0009-kata-containers-fix-kata-runtime-hungs-when-qemu-proces.patch

diff --git a/kata-containers.spec b/kata-containers.spec
index 8ec5fee..4bb706c 100644
--- a/kata-containers.spec
+++ b/kata-containers.spec
@@ -2,7 +2,7 @@
 %global debug_package %{nil}
 
 %define VERSION 2.1.0
-%define RELEASE 5
+%define RELEASE 6
 
 Name:           kata-containers
 Version:        %{VERSION}
@@ -108,6 +108,12 @@ strip %{buildroot}/usr/bin/containerd-shim-kata-v2
 %doc
 
 %changelog
+* Fri Oct 5 2021 jikui <jikui2@huawei.com> - 2.1.0-6
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:fix kata-runtime hungs when qemu process is D/T
+
 * Mon Sep 27 2021 yangfeiyu <yangfeiyu2@huawei.com> - 2.1.0-5
 - Type:enhancement
 - ID:NA
diff --git a/patches/0009-kata-containers-fix-kata-runtime-hungs-when-qemu-proces.patch b/patches/0009-kata-containers-fix-kata-runtime-hungs-when-qemu-proces.patch
new file mode 100644
index 0000000..d8464f9
--- /dev/null
+++ b/patches/0009-kata-containers-fix-kata-runtime-hungs-when-qemu-proces.patch
@@ -0,0 +1,27 @@
+From c563b455e3bb0cebfbe2a77c8d5ebac36aac3c76 Mon Sep 17 00:00:00 2001
+From: jikui <jikui2@huawei.com>
+Date: Thu, 4 Nov 2021 19:58:33 +0800
+Subject: [PATCH 1/8] kata-runtime: fix kata-runtime hungs when qemu process is
+ D/T state
+
+Signed-off-by: jikui <jikui2@huawei.com>
+---
+ src/runtime/vendor/github.com/kata-containers/govmm/qemu/qmp.go | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/runtime/vendor/github.com/kata-containers/govmm/qemu/qmp.go b/src/runtime/vendor/github.com/kata-containers/govmm/qemu/qmp.go
+index 97e9245..325250d 100644
+--- a/src/runtime/vendor/github.com/kata-containers/govmm/qemu/qmp.go
++++ b/src/runtime/vendor/github.com/kata-containers/govmm/qemu/qmp.go
+@@ -717,6 +717,8 @@ func QMPStart(ctx context.Context, socket string, cfg QMPConfig, disconnectedCh
+ 		if q.version == nil {
+ 			return nil, nil, fmt.Errorf("failed to find QMP version information")
+ 		}
++	case <-time.After(15 * time.Second):
++		return nil, nil, fmt.Errorf("qmp start time out")
+ 	}
+ 
+ 	return q, q.version, nil
+-- 
+2.25.1
+
diff --git a/series.conf b/series.conf
index 482704e..9ba5e56 100644
--- a/series.conf
+++ b/series.conf
@@ -6,3 +6,4 @@
 0006-factory-add-the-template-factory-support-for-hypervi.patch
 0007-kata-containers-support-with-iSulad.patch
 0008-kata-containers-adpat-with-iSulad.patch
+0009-kata-containers-fix-kata-runtime-hungs-when-qemu-proces.patch