From a8df3cef5af2ebe9ef7039c4cb6a8df0fb0a1ba0 Mon Sep 17 00:00:00 2001
From: Qiu Jian <qiujian@yunionyun.com>
Date: Sun, 26 Sep 2021 17:29:02 +0800
Subject: [PATCH] fix: host add disable_kvm option

---
 pkg/hostman/guestman/qemu-arm.go       | 38 +++++++++++++++++---------
 pkg/hostman/guestman/qemu-kvmhelper.go | 14 ++++------
 pkg/hostman/options/options.go         |  2 ++
 3 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/pkg/hostman/guestman/qemu-arm.go b/pkg/hostman/guestman/qemu-arm.go
index 91d277d2a0..4021014c94 100644
--- a/pkg/hostman/guestman/qemu-arm.go
+++ b/pkg/hostman/guestman/qemu-arm.go
@@ -136,24 +136,36 @@ func (s *SKVMGuestInstance) generateArmStartScript(data *jsonutils.JSONDict) (st
 	cmd += "else\n"
 	cmd += "    QEMU_CMD=$DEFAULT_QEMU_CMD\n"
 	cmd += "fi\n"
-	cmd += "function nic_speed() {\n"
-	cmd += "    $QEMU_CMD "
-
-	if s.IsKvmSupport() {
-		cmd += "-enable-kvm"
+	if s.IsKvmSupport() && !options.HostOptions.DisableKVM {
+		cmd += "QEMU_CMD_KVM_ARG=-enable-kvm\n"
+	} else {
+		cmd += "QEMU_CMD_KVM_ARG=\n"
 	}
+	cmd += `
+function nic_speed() {
+    $QEMU_CMD $QEMU_CMD_KVM_ARG -device virtio-net-pci,help 2>&1 | grep -q "\<speed="
+    if [ "$?" -eq "0" ]; then
+        echo ",speed=$1"
+    fi
+}
 
-	cmd += " -device virtio-net-pci,? 2>&1 | grep .speed= > /dev/null\n"
-	cmd += "    if [ \"$?\" -eq \"0\" ]; then\n"
-	cmd += "        echo \",speed=$1\"\n"
-	cmd += "    fi\n"
-	cmd += "}\n"
+function nic_mtu() {
+    local bridge="$1"; shift
+
+    $QEMU_CMD $QEMU_CMD_KVM_ARG -device virtio-net-pci,help 2>&1 | grep -q '\<host_mtu='
+    if [ "$?" -eq "0" ]; then
+        local origmtu="$(<"/sys/class/net/$bridge/mtu")"
+        if [ -n "$origmtu" -a "$origmtu" -gt 576 ]; then
+            echo ",host_mtu=$(($origmtu - 58))"
+        fi
+    fi
+}
+`
 
 	// Generate Start VM script
-	cmd += `CMD="$QEMU_CMD`
+	cmd += `CMD="$QEMU_CMD $QEMU_CMD_KVM_ARG`
 	var accel, cpuType string
-	if s.IsKvmSupport() {
-		cmd += " -enable-kvm"
+	if s.IsKvmSupport() && !options.HostOptions.DisableKVM {
 		accel = "kvm"
 		if options.HostOptions.HostCpuPassthrough {
 			cpuType = "host"
diff --git a/pkg/hostman/guestman/qemu-kvmhelper.go b/pkg/hostman/guestman/qemu-kvmhelper.go
index c22ed66773..88f77246f2 100644
--- a/pkg/hostman/guestman/qemu-kvmhelper.go
+++ b/pkg/hostman/guestman/qemu-kvmhelper.go
@@ -435,7 +435,7 @@ func (s *SKVMGuestInstance) _generateStartScript(data *jsonutils.JSONDict) (stri
 	// cmd += "    fi\n"
 	// cmd += "else\n"
 	cmd += "QEMU_CMD=$DEFAULT_QEMU_CMD\n"
-	if s.IsKvmSupport() {
+	if s.IsKvmSupport() && !options.HostOptions.DisableKVM {
 		cmd += "QEMU_CMD_KVM_ARG=-enable-kvm\n"
 	} else {
 		cmd += "QEMU_CMD_KVM_ARG=-no-kvm\n"
@@ -455,18 +455,17 @@ function nic_mtu() {
     $QEMU_CMD $QEMU_CMD_KVM_ARG -device virtio-net-pci,help 2>&1 | grep -q '\<host_mtu='
     if [ "$?" -eq "0" ]; then
         local origmtu="$(<"/sys/class/net/$bridge/mtu")"
-	if [ -n "$origmtu" -a "$origmtu" -gt 576 ]; then
-                echo ",host_mtu=$(($origmtu - 58))"
-	fi
+        if [ -n "$origmtu" -a "$origmtu" -gt 576 ]; then
+            echo ",host_mtu=$(($origmtu - 58))"
+        fi
     fi
 }
 `
 
 	// Generate Start VM script
-	cmd += `CMD="$QEMU_CMD`
+	cmd += `CMD="$QEMU_CMD $QEMU_CMD_KVM_ARG`
 	var accel, cpuType string
-	if s.IsKvmSupport() {
-		cmd += " -enable-kvm"
+	if s.IsKvmSupport() && !options.HostOptions.DisableKVM {
 		accel = "kvm"
 		cpuType = ""
 		if osname == OS_NAME_MACOS {
@@ -493,7 +492,6 @@ function nic_mtu() {
 			cpuType = isolatedDevsParams.Cpu
 		}
 	} else {
-		cmd += " -no-kvm"
 		accel = "tcg"
 		cpuType = "qemu64"
 	}
diff --git a/pkg/hostman/options/options.go b/pkg/hostman/options/options.go
index ef58c9bc34..5a870b4ee6 100644
--- a/pkg/hostman/options/options.go
+++ b/pkg/hostman/options/options.go
@@ -142,6 +142,8 @@ type SHostOptions struct {
 
 	DisableProbeKubelet bool   `help:"Disable probe kubelet config" default:"false"`
 	KubeletRunDirectory string `help:"Kubelet config file path" default:"/var/lib/kubelet"`
+
+	DisableKVM bool `help:"force disable KVM" default:"false"`
 }
 
 var (