github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-04-29 20:24:31 +00:00
Code Issues Projects Releases Wiki Activity

runtime: drop qemu-lite support

Browse Source 
As the project is not maintained and we have not been testing against it
for a long time.

Fixes: #2529
Signed-off-by: Peng Tao <bergwolf@hyper.sh>
This commit is contained in:
Peng Tao 2021-08-30 16:13:28 +08:00
parent 8ae3edbc18
commit a9de761d71
6 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/runtime/cli/main_test.go
View File

@ -210,7 +210,7 @@ func newTestHypervisorConfig(dir string, create bool) (vc.HypervisorConfig, erro
KernelPath: kernelPath, KernelPath: kernelPath,
ImagePath: imagePath, ImagePath: imagePath,
HypervisorPath: hypervisorPath, HypervisorPath: hypervisorPath,
HypervisorMachineType: "pc-lite", HypervisorMachineType: "q35",
}, nil }, nil
} }

2
src/runtime/containerd-shim-v2/utils_test.go
View File

@ -192,7 +192,7 @@ func newTestHypervisorConfig(dir string, create bool) (vc.HypervisorConfig, erro
KernelPath: kernelPath, KernelPath: kernelPath,
ImagePath: imagePath, ImagePath: imagePath,
HypervisorPath: hypervisorPath, HypervisorPath: hypervisorPath,
HypervisorMachineType: "pc-lite", HypervisorMachineType: "q35",
}, nil }, nil
} }

2
src/runtime/pkg/katautils/create_test.go
View File

@ -138,7 +138,7 @@ func newTestHypervisorConfig(dir string, create bool) (vc.HypervisorConfig, erro
KernelPath: kernelPath, KernelPath: kernelPath,
ImagePath: imagePath, ImagePath: imagePath,
HypervisorPath: hypervisorPath, HypervisorPath: hypervisorPath,
HypervisorMachineType: "pc-lite", HypervisorMachineType: "q35",
}, nil }, nil
} }

5
src/runtime/virtcontainers/qemu_amd64.go
View File

@ -43,7 +43,6 @@ const (
) )
var qemuPaths = map[string]string{ var qemuPaths = map[string]string{
QemuPCLite: "/usr/bin/qemu-lite-system-x86_64",
QemuQ35: defaultQemuPath, QemuQ35: defaultQemuPath,
QemuMicrovm: defaultQemuPath, QemuMicrovm: defaultQemuPath,
} }
@ -66,10 +65,6 @@ var kernelParams = []Param{
} }
var supportedQemuMachines = []govmmQemu.Machine{ var supportedQemuMachines = []govmmQemu.Machine{
{
Type: QemuPCLite,
Options: defaultQemuMachineOptions,
},
{ {
Type: QemuQ35, Type: QemuQ35,
Options: defaultQemuMachineOptions, Options: defaultQemuMachineOptions,

3
src/runtime/virtcontainers/qemu_arch_base.go
View File

@ -209,9 +209,6 @@ const (
const bridgePCIStartAddr = 2 const bridgePCIStartAddr = 2
const ( const (
// QemuPCLite is the QEMU pc-lite machine type for amd64
QemuPCLite = "pc-lite"
// QemuQ35 is the QEMU Q35 machine type for amd64 // QemuQ35 is the QEMU Q35 machine type for amd64
QemuQ35 = "q35" QemuQ35 = "q35"

2
src/runtime/virtcontainers/qemu_arch_base_test.go
View File

@ -158,7 +158,7 @@ func TestQemuAddDeviceToBridge(t *testing.T) {
// addDeviceToBridge fails cause q.Bridges == 0 // addDeviceToBridge fails cause q.Bridges == 0
q = newQemuArchBase() q = newQemuArchBase()
q.qemuMachine.Type = QemuPCLite q.qemuMachine.Type = QemuQ35
q.bridges(0) q.bridges(0)
_, _, err = q.addDeviceToBridge(context.Background(), "qemu-bridge", types.PCI) _, _, err = q.addDeviceToBridge(context.Background(), "qemu-bridge", types.PCI)
if assert.Error(err) { if assert.Error(err) {