!4 add support for stratovirt of kata-check cli
From: @zhangliang5 Reviewed-by: @flyflyflypeng Signed-off-by: @flyflyflypeng
This commit is contained in:
commit
db6673e075
@ -2,7 +2,7 @@
|
|||||||
%global debug_package %{nil}
|
%global debug_package %{nil}
|
||||||
|
|
||||||
%define VERSION v1.11.1
|
%define VERSION v1.11.1
|
||||||
%define RELEASE 7
|
%define RELEASE 8
|
||||||
|
|
||||||
Name: kata-containers
|
Name: kata-containers
|
||||||
Version: %{VERSION}
|
Version: %{VERSION}
|
||||||
@ -90,6 +90,12 @@ install -p -m 640 -D ./runtime/cli/config/configuration-qemu.toml %{buildroot}/u
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jan 7 2021 LiangZhang<zhangliang5@huawei.com> - 1.11.1-8
|
||||||
|
- Type:feature
|
||||||
|
- ID:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:add suport for stratovirt of kata-check cli
|
||||||
|
|
||||||
* Tue Dec 22 2020 jiangpengfei<jiangpengfei9@huawei.com> - 1.11.1-7
|
* Tue Dec 22 2020 jiangpengfei<jiangpengfei9@huawei.com> - 1.11.1-7
|
||||||
- Type:enhancement
|
- Type:enhancement
|
||||||
- ID:NA
|
- ID:NA
|
||||||
|
|||||||
@ -0,0 +1,38 @@
|
|||||||
|
From 5af764ee8aad86f57df64ad78b44611c47067cc9 Mon Sep 17 00:00:00 2001
|
||||||
|
From: LiangZhang <zhangliang5@huawei.com>
|
||||||
|
Date: Tue, 15 Dec 2020 10:14:10 +0800
|
||||||
|
Subject: [PATCH] runtime: add support for stratovirt of kata-check cli
|
||||||
|
|
||||||
|
reason: The current version of kata-check lacks support of stratovirt
|
||||||
|
|
||||||
|
Signed-off-by: LiangZhang <zhangliang5@huawei.com>
|
||||||
|
---
|
||||||
|
cli/kata-check_amd64.go | 4 +++-
|
||||||
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/cli/kata-check_amd64.go b/cli/kata-check_amd64.go
|
||||||
|
index 8376293..ae62746 100644
|
||||||
|
--- a/cli/kata-check_amd64.go
|
||||||
|
+++ b/cli/kata-check_amd64.go
|
||||||
|
@@ -107,7 +107,7 @@ func setCPUtype(hypervisorType vc.HypervisorType) error {
|
||||||
|
fallthrough
|
||||||
|
case "clh":
|
||||||
|
fallthrough
|
||||||
|
- case "qemu":
|
||||||
|
+ case "qemu", "stratovirt":
|
||||||
|
archRequiredCPUFlags = map[string]string{
|
||||||
|
cpuFlagVMX: "Virtualization support",
|
||||||
|
cpuFlagLM: "64Bit CPU",
|
||||||
|
@@ -286,6 +286,8 @@ func archHostCanCreateVMContainer(hypervisorType vc.HypervisorType) error {
|
||||||
|
switch hypervisorType {
|
||||||
|
case "qemu":
|
||||||
|
fallthrough
|
||||||
|
+ case "stratovirt":
|
||||||
|
+ fallthrough
|
||||||
|
case "clh":
|
||||||
|
fallthrough
|
||||||
|
case "firecracker":
|
||||||
|
--
|
||||||
|
2.25.1
|
||||||
|
|
||||||
|
|
||||||
@ -61,3 +61,4 @@
|
|||||||
0061-kata-runtime-retry-inserting-of-CNI-interface.patch
|
0061-kata-runtime-retry-inserting-of-CNI-interface.patch
|
||||||
0062-kata-runtime-support-using-CNI-plugin-to-insert-muti.patch
|
0062-kata-runtime-support-using-CNI-plugin-to-insert-muti.patch
|
||||||
0063-kata-runtime-fix-get-sandbox-cpu-resources-problem.patch
|
0063-kata-runtime-fix-get-sandbox-cpu-resources-problem.patch
|
||||||
|
0064-runtime-add-support-for-stratovirt-of-kata-check-cli.patch
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user