From dae06cb500c7b24c4d888f8e8abce359341d3314 Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Thu, 17 Dec 2020 18:38:16 +0800 Subject: [PATCH] refactor(host): startvm: add QEMU_CMD_KVM_ARG --- pkg/hostman/guestman/qemu-kvmhelper.go | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkg/hostman/guestman/qemu-kvmhelper.go b/pkg/hostman/guestman/qemu-kvmhelper.go index a264630f3f..35131a4e94 100644 --- a/pkg/hostman/guestman/qemu-kvmhelper.go +++ b/pkg/hostman/guestman/qemu-kvmhelper.go @@ -401,17 +401,14 @@ func (s *SKVMGuestInstance) _generateStartScript(data *jsonutils.JSONDict) (stri // cmd += " fi\n" // cmd += "else\n" cmd += "QEMU_CMD=$DEFAULT_QEMU_CMD\n" + if s.IsKvmSupport() { + cmd += "QEMU_CMD_KVM_ARG=-enable-kvm\n" + } else { + cmd += "QEMU_CMD_KVM_ARG=-no-kvm\n" + } // cmd += "fi\n" cmd += "function nic_speed() {\n" - cmd += " $QEMU_CMD " - - if s.IsKvmSupport() { - cmd += "-enable-kvm" - } else { - cmd += "-no-kvm" - } - - cmd += " -device virtio-net-pci,? 2>&1 | grep .speed= > /dev/null\n" + cmd += " $QEMU_CMD $QEMU_CMD_KVM_ARG -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"