mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-04-29 12:14:48 +00:00
runtime: drop qemu-lite support
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:
parent
8ae3edbc18
commit
a9de761d71
@ -210,7 +210,7 @@ func newTestHypervisorConfig(dir string, create bool) (vc.HypervisorConfig, erro
|
||||
KernelPath: kernelPath,
|
||||
ImagePath: imagePath,
|
||||
HypervisorPath: hypervisorPath,
|
||||
HypervisorMachineType: "pc-lite",
|
||||
HypervisorMachineType: "q35",
|
||||
}, nil
|
||||
}
|
||||
|
||||
|
@ -192,7 +192,7 @@ func newTestHypervisorConfig(dir string, create bool) (vc.HypervisorConfig, erro
|
||||
KernelPath: kernelPath,
|
||||
ImagePath: imagePath,
|
||||
HypervisorPath: hypervisorPath,
|
||||
HypervisorMachineType: "pc-lite",
|
||||
HypervisorMachineType: "q35",
|
||||
}, nil
|
||||
}
|
||||
|
||||
|
@ -138,7 +138,7 @@ func newTestHypervisorConfig(dir string, create bool) (vc.HypervisorConfig, erro
|
||||
KernelPath: kernelPath,
|
||||
ImagePath: imagePath,
|
||||
HypervisorPath: hypervisorPath,
|
||||
HypervisorMachineType: "pc-lite",
|
||||
HypervisorMachineType: "q35",
|
||||
}, nil
|
||||
}
|
||||
|
||||
|
@ -43,7 +43,6 @@ const (
|
||||
)
|
||||
|
||||
var qemuPaths = map[string]string{
|
||||
QemuPCLite: "/usr/bin/qemu-lite-system-x86_64",
|
||||
QemuQ35: defaultQemuPath,
|
||||
QemuMicrovm: defaultQemuPath,
|
||||
}
|
||||
@ -66,10 +65,6 @@ var kernelParams = []Param{
|
||||
}
|
||||
|
||||
var supportedQemuMachines = []govmmQemu.Machine{
|
||||
{
|
||||
Type: QemuPCLite,
|
||||
Options: defaultQemuMachineOptions,
|
||||
},
|
||||
{
|
||||
Type: QemuQ35,
|
||||
Options: defaultQemuMachineOptions,
|
||||
|
@ -209,9 +209,6 @@ const (
|
||||
const bridgePCIStartAddr = 2
|
||||
|
||||
const (
|
||||
// QemuPCLite is the QEMU pc-lite machine type for amd64
|
||||
QemuPCLite = "pc-lite"
|
||||
|
||||
// QemuQ35 is the QEMU Q35 machine type for amd64
|
||||
QemuQ35 = "q35"
|
||||
|
||||
|
@ -158,7 +158,7 @@ func TestQemuAddDeviceToBridge(t *testing.T) {
|
||||
|
||||
// addDeviceToBridge fails cause q.Bridges == 0
|
||||
q = newQemuArchBase()
|
||||
q.qemuMachine.Type = QemuPCLite
|
||||
q.qemuMachine.Type = QemuQ35
|
||||
q.bridges(0)
|
||||
_, _, err = q.addDeviceToBridge(context.Background(), "qemu-bridge", types.PCI)
|
||||
if assert.Error(err) {
|
||||
|
Loading…
Reference in New Issue
Block a user