From d4093e2155af5588f5fdf62113eb393b7ab2f5d9 Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Thu, 17 Dec 2020 18:40:20 +0800 Subject: [PATCH] refactor(host): startvm: nic_speed: use raw string --- pkg/hostman/guestman/qemu-kvmhelper.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkg/hostman/guestman/qemu-kvmhelper.go b/pkg/hostman/guestman/qemu-kvmhelper.go index 35131a4e94..eefe152ecb 100644 --- a/pkg/hostman/guestman/qemu-kvmhelper.go +++ b/pkg/hostman/guestman/qemu-kvmhelper.go @@ -407,12 +407,14 @@ func (s *SKVMGuestInstance) _generateStartScript(data *jsonutils.JSONDict) (stri cmd += "QEMU_CMD_KVM_ARG=-no-kvm\n" } // cmd += "fi\n" - cmd += "function nic_speed() {\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" - cmd += "}\n" + cmd += ` +function nic_speed() { + $QEMU_CMD $QEMU_CMD_KVM_ARG -device virtio-net-pci,? 2>&1 | grep .speed= > /dev/null + if [ "$?" -eq "0" ]; then + echo ",speed=$1" + fi +} +` // Generate Start VM script cmd += `CMD="$QEMU_CMD`