aljaz/kata-containers
1
0
Fork 0
mirror of https://github.com/aljazceru/kata-containers.git synced 2026-02-03 21:54:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

runtime: Use consts in kata-runtime check

Browse Source 
Fixes: #6095

We're already importing the virtcontainers package so might as well
use the constants for the hypervisor types we're checking against instead
of typing the names out in the switch cases.

Signed-off-by: Danny Canter <danny@dcantah.dev>
This commit is contained in:
Danny Canter
2023-01-17 06:50:12 -08:00
parent 790f45190b
commit ba87e0afea
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/runtime/cmd/kata-runtime/kata-check_amd64.go
View File

@@ -115,13 +115,13 @@ func setCPUtype(hypervisorType vc.HypervisorType) error {
}
switch hypervisorType {
case "firecracker":
case vc.FirecrackerHypervisor:
fallthrough
case "clh":
case vc.ClhHypervisor:
fallthrough
case "dragonball":
case vc.DragonballHypervisor:
fallthrough
case "qemu":
case vc.QemuHypervisor:
archRequiredCPUFlags = map[string]string{
cpuFlagVMX: "Virtualization support",
cpuFlagLM: "64Bit CPU",
@@ -153,7 +153,7 @@ func setCPUtype(hypervisorType vc.HypervisorType) error {
required: false,
},
}
case "acrn":
case vc.AcrnHypervisor:
archRequiredCPUFlags = map[string]string{
cpuFlagLM: "64Bit CPU",
cpuFlagSSE4_1: "SSE4.1",
@@ -175,7 +175,7 @@ func setCPUtype(hypervisorType vc.HypervisorType) error {
required: false,
},
}
case "mock":
case vc.MockHypervisor:
archRequiredCPUFlags = map[string]string{
cpuFlagVMX: "Virtualization support",
cpuFlagLM: "64Bit CPU",
@@ -310,17 +310,16 @@ func acrnIsUsable() error {
}
func archHostCanCreateVMContainer(hypervisorType vc.HypervisorType) error {
switch hypervisorType {
case "qemu":
case vc.QemuHypervisor:
fallthrough
case "clh":
case vc.ClhHypervisor:
fallthrough
case "firecracker":
case vc.FirecrackerHypervisor:
return kvmIsUsable()
case "acrn":
case vc.AcrnHypervisor:
return acrnIsUsable()
case "mock":
case vc.MockHypervisor:
return nil
default:
return fmt.Errorf("archHostCanCreateVMContainer: Unknown hypervisor type %s", hypervisorType)