From 2a07fc1ecb6a0f159cc8609a9e81c19f382e0ff8 Mon Sep 17 00:00:00 2001 From: wanyaoqi <18528551+wanyaoqi@users.noreply.github.com> Date: Fri, 8 Jul 2022 21:35:50 +0800 Subject: [PATCH] fix(host): prepare guest config on state paused (#14597) run onGuestPrelaunch on guest state paused Signed-off-by: wanyaoqi --- pkg/hostman/guestman/guesttasks.go | 1 + pkg/hostman/guestman/qemu/generate.go | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/hostman/guestman/guesttasks.go b/pkg/hostman/guestman/guesttasks.go index 6099c9bbfe..0dca071d7f 100644 --- a/pkg/hostman/guestman/guesttasks.go +++ b/pkg/hostman/guestman/guesttasks.go @@ -941,6 +941,7 @@ func (s *SGuestResumeTask) onConfirmRunning(status string) { // handle error first, results may be 'paused (internal-error)' s.taskFailed(status) } else if strings.Contains(status, "paused") { + s.onGuestPrelaunch() s.Monitor.GetBlocks(s.onGetBlockInfo) } else if status == "postmigrate" { s.resumeGuest() diff --git a/pkg/hostman/guestman/qemu/generate.go b/pkg/hostman/guestman/qemu/generate.go index 1d7bb5a295..7d3d580ea8 100644 --- a/pkg/hostman/guestman/qemu/generate.go +++ b/pkg/hostman/guestman/qemu/generate.go @@ -525,8 +525,6 @@ func getMigrateOptions(drvOpt QemuOptions, input *GenerateStartOptionsInput) []s } } else if input.IsSlave { opts = append(opts, fmt.Sprintf("-incoming tcp:0:%d", input.LiveMigratePort)) - } else if input.IsMaster { - opts = append(opts, "-S") } return opts }