From 0bdfdad236b00bb36bf9fec0bba06b76163da8ad Mon Sep 17 00:00:00 2001
From: Peng Tao <bergwolf@hyper.sh>
Date: Mon, 30 Aug 2021 16:13:28 +0800
Subject: [PATCH] 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>
---
 src/runtime/cli/main_test.go                      | 2 +-
 src/runtime/containerd-shim-v2/utils_test.go      | 2 +-
 src/runtime/pkg/katautils/create_test.go          | 2 +-
 src/runtime/virtcontainers/qemu_amd64.go          | 5 -----
 src/runtime/virtcontainers/qemu_arch_base.go      | 3 ---
 src/runtime/virtcontainers/qemu_arch_base_test.go | 2 +-
 6 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/runtime/cli/main_test.go b/src/runtime/cli/main_test.go
index 5baa3c87af..b6a6f634b4 100644
--- a/src/runtime/cli/main_test.go
+++ b/src/runtime/cli/main_test.go
@@ -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
 }
 
diff --git a/src/runtime/containerd-shim-v2/utils_test.go b/src/runtime/containerd-shim-v2/utils_test.go
index 96faeaf719..05c8bdc9ee 100644
--- a/src/runtime/containerd-shim-v2/utils_test.go
+++ b/src/runtime/containerd-shim-v2/utils_test.go
@@ -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
 }
 
diff --git a/src/runtime/pkg/katautils/create_test.go b/src/runtime/pkg/katautils/create_test.go
index 7f033082f6..fa6b434d09 100644
--- a/src/runtime/pkg/katautils/create_test.go
+++ b/src/runtime/pkg/katautils/create_test.go
@@ -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
 }
 
diff --git a/src/runtime/virtcontainers/qemu_amd64.go b/src/runtime/virtcontainers/qemu_amd64.go
index 1129d4d340..eab95ff571 100644
--- a/src/runtime/virtcontainers/qemu_amd64.go
+++ b/src/runtime/virtcontainers/qemu_amd64.go
@@ -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,
diff --git a/src/runtime/virtcontainers/qemu_arch_base.go b/src/runtime/virtcontainers/qemu_arch_base.go
index 50a82bf5a3..98fdfb7661 100644
--- a/src/runtime/virtcontainers/qemu_arch_base.go
+++ b/src/runtime/virtcontainers/qemu_arch_base.go
@@ -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"
 
diff --git a/src/runtime/virtcontainers/qemu_arch_base_test.go b/src/runtime/virtcontainers/qemu_arch_base_test.go
index c1ea7d0b8d..1cd904864b 100644
--- a/src/runtime/virtcontainers/qemu_arch_base_test.go
+++ b/src/runtime/virtcontainers/qemu_arch_base_test.go
@@ -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) {