Merge pull request #13446 from ioito/hotfix/qx-qemu-arg

fix(host): arm qemu remove -no-kvm

pkg/compute/guestdrivers/kvm.go

@@ -308,7 +308,7 @@ func (self *SKVMGuestDriver) RequestSyncstatusOnHost(ctx context.Context, guest
 	header := self.getTaskRequestHeader(task)
 
 	url := fmt.Sprintf("%s/servers/%s/status", host.ManagerUri, guest.Id)
-	_, res, err := httputils.JSONRequest(httputils.GetDefaultClient(), ctx, "GET", url, header, nil, true)
+	_, res, err := httputils.JSONRequest(httputils.GetDefaultClient(), ctx, "GET", url, header, nil, false)
 	if err != nil {
 		return err
 	}

pkg/hostman/guestman/qemu-kvmhelper.go

@@ -30,6 +30,7 @@ import (
 	"yunion.io/x/pkg/errors"
 	"yunion.io/x/pkg/utils"
 
+	"yunion.io/x/onecloud/pkg/apis"
 	api "yunion.io/x/onecloud/pkg/apis/compute"
 	"yunion.io/x/onecloud/pkg/hostman/guestman/qemu"
 	qemucerts "yunion.io/x/onecloud/pkg/hostman/guestman/qemu/certs"
@@ -332,8 +333,12 @@ func (s *SKVMGuestInstance) generateStartScript(data *jsonutils.JSONDict) (strin
 	cmd += "QEMU_CMD=$DEFAULT_QEMU_CMD\n"
 	if s.IsKvmSupport() && !options.HostOptions.DisableKVM {
 		cmd += "QEMU_CMD_KVM_ARG=-enable-kvm\n"
-	} else {
+	} else if utils.IsInStringArray(s.manager.host.GetCpuArchitecture(), apis.ARCH_X86) {
+		// -no-kvm仅x86适用，且将在qemu 5.2之后移除
+		// https://gitlab.com/qemu-project/qemu/-/blob/master/docs/about/removed-features.rst
 		cmd += "QEMU_CMD_KVM_ARG=-no-kvm\n"
+	} else {
+		cmd += "QEMU_CMD_KVM_ARG=\n"
 	}
 	// cmd += "fi\n"
 	cmd += `
@@ -523,7 +528,7 @@ function nic_mtu() {
 	// cmd += "elif [ ! -z \"$STATE_FILE\" ] && [ -f $STATE_FILE ]; then\n"
 	// cmd += "    $CMD --incoming \"exec: cat $STATE_FILE\"\n"
 	// cmd += "else\n"
-	cmd += "$CMD\n"
+	cmd += "eval $CMD\n"
 	// cmd += "fi\n"
 
 	return cmd, nil

pkg/hostman/guestman/qemu/qemu.go

@@ -226,7 +226,7 @@ func (o baseOptions) KeyboardLayoutLanguage(lang string) string {
 }
 
 func (o baseOptions) Name(name string) string {
-	return "-name " + name
+	return fmt.Sprintf(`-name '%s'`, name)
 }
 
 func (o baseOptions) UUID(enable bool, uuid string) string {