From 2acca1a70fd9c79f6970020e42af6d2ca57cb340 Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Thu, 10 Dec 2020 11:47:34 +0800 Subject: [PATCH] fix(host): guestman: variable name typo --- pkg/hostman/guestman/guestman.go | 12 ++++++------ pkg/hostman/guestman/qemu-kvmhelper.go | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkg/hostman/guestman/guestman.go b/pkg/hostman/guestman/guestman.go index dcfb35b9d7..4da0ff1188 100644 --- a/pkg/hostman/guestman/guestman.go +++ b/pkg/hostman/guestman/guestman.go @@ -787,7 +787,7 @@ func (m *SGuestManager) OnlineResizeDisk(ctx context.Context, sid string, diskId // if !ok { // return nil, hostutils.ParamsError // } -// guest := guestManger.Servers[sid] +// guest := guestManager.Servers[sid] // port := m.GetFreePortByBase(BUILT_IN_NBD_SERVER_PORT_BASE) // } @@ -867,18 +867,18 @@ func (m *SGuestManager) RequestVerifyDirtyServer(s *SKVMGuestInstance) { } } -var guestManger *SGuestManager +var guestManager *SGuestManager func Stop() { - guestManger.ExitGuestCleanup() + guestManager.ExitGuestCleanup() } func Init(host hostutils.IHost, serversPath string) { - if guestManger == nil { - guestManger = NewGuestManager(host, serversPath) + if guestManager == nil { + guestManager = NewGuestManager(host, serversPath) } } func GetGuestManager() *SGuestManager { - return guestManger + return guestManager } diff --git a/pkg/hostman/guestman/qemu-kvmhelper.go b/pkg/hostman/guestman/qemu-kvmhelper.go index a264630f3f..72209653ff 100644 --- a/pkg/hostman/guestman/qemu-kvmhelper.go +++ b/pkg/hostman/guestman/qemu-kvmhelper.go @@ -54,7 +54,7 @@ const ( ) func (s *SKVMGuestInstance) IsKvmSupport() bool { - return guestManger.GetHost().IsKvmSupport() + return guestManager.GetHost().IsKvmSupport() } func (s *SKVMGuestInstance) IsVdiSpice() bool { @@ -218,7 +218,7 @@ func (s *SKVMGuestInstance) getNicDownScriptPath(nic jsonutils.JSONObject) strin func (s *SKVMGuestInstance) generateNicScripts(nic jsonutils.JSONObject) error { bridge, _ := nic.GetString("bridge") - dev := guestManger.GetHost().GetBridgeDev(bridge) + dev := guestManager.GetHost().GetBridgeDev(bridge) if dev == nil { return fmt.Errorf("Can't find bridge %s", bridge) } @@ -440,7 +440,7 @@ func (s *SKVMGuestInstance) _generateStartScript(data *jsonutils.JSONDict) (stri } } - if !guestManger.GetHost().IsNestedVirtualization() { + if !guestManager.GetHost().IsNestedVirtualization() { cpuType += ",kvm=off" }