github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-07 12:29:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6096 from dcantah/kataruntime-use_hyp_consts

Browse Source 
runtime: Use consts in `kata-runtime check`
This commit is contained in:
GabyCT 2023-01-18 10:54:42 -06:00 committed by GitHub
commit 421a33f846
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 12 deletions
Show Stats 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 { switch hypervisorType {
case "firecracker": case vc.FirecrackerHypervisor:
fallthrough fallthrough
case "clh": case vc.ClhHypervisor:
fallthrough fallthrough
case "dragonball": case vc.DragonballHypervisor:
fallthrough fallthrough
case "qemu": case vc.QemuHypervisor:
archRequiredCPUFlags = map[string]string{ archRequiredCPUFlags = map[string]string{
cpuFlagVMX: "Virtualization support", cpuFlagVMX: "Virtualization support",
cpuFlagLM: "64Bit CPU", cpuFlagLM: "64Bit CPU",
@ -153,7 +153,7 @@ func setCPUtype(hypervisorType vc.HypervisorType) error {
required: false, required: false,
}, },
} }
case "acrn": case vc.AcrnHypervisor:
archRequiredCPUFlags = map[string]string{ archRequiredCPUFlags = map[string]string{
cpuFlagLM: "64Bit CPU", cpuFlagLM: "64Bit CPU",
cpuFlagSSE4_1: "SSE4.1", cpuFlagSSE4_1: "SSE4.1",
@ -175,7 +175,7 @@ func setCPUtype(hypervisorType vc.HypervisorType) error {
required: false, required: false,
}, },
} }
case "mock": case vc.MockHypervisor:
archRequiredCPUFlags = map[string]string{ archRequiredCPUFlags = map[string]string{
cpuFlagVMX: "Virtualization support", cpuFlagVMX: "Virtualization support",
cpuFlagLM: "64Bit CPU", cpuFlagLM: "64Bit CPU",
@ -310,17 +310,16 @@ func acrnIsUsable() error {
} }
func archHostCanCreateVMContainer(hypervisorType vc.HypervisorType) error { func archHostCanCreateVMContainer(hypervisorType vc.HypervisorType) error {
switch hypervisorType { switch hypervisorType {
case "qemu": case vc.QemuHypervisor:
fallthrough fallthrough
case "clh": case vc.ClhHypervisor:
fallthrough fallthrough
case "firecracker": case vc.FirecrackerHypervisor:
return kvmIsUsable() return kvmIsUsable()
case "acrn": case vc.AcrnHypervisor:
return acrnIsUsable() return acrnIsUsable()
case "mock": case vc.MockHypervisor:
return nil return nil
default: default:
return fmt.Errorf("archHostCanCreateVMContainer: Unknown hypervisor type %s", hypervisorType) return fmt.Errorf("archHostCanCreateVMContainer: Unknown hypervisor type %s", hypervisorType)