opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-01 15:07:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(host): live migrate misc fix

Browse Source
This commit is contained in:
wanyaoqi
2023-10-25 01:57:08 +08:00
parent 989c83291b
commit 5aeaebd9dc
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/hostman/guestman/guesttasks.go
+1 -1
View File
@@ -1053,7 +1053,7 @@ func (s *SGuestLiveMigrateTask) onSetAutoConverge(res string) {
s.Monitor.MigrateSetCapability("events", "on", s.onMigrateEnableEvents)
}
func (s SGuestLiveMigrateTask) onMigrateEnableEvents(res string) {
func (s *SGuestLiveMigrateTask) onMigrateEnableEvents(res string) {
if strings.Contains(strings.ToLower(res), "error") {
s.migrateFailed(fmt.Sprintf("Migrate set capability events error: %s", res))
return
pkg/hostman/guestman/qemu/generate.go
+10 -4
View File
@@ -169,10 +169,16 @@ func generateMachineOption(machine string, machineDesc *desc.SGuestMachine) stri
}
func generateSMPOption(cpu *desc.SGuestCpu) string {
return fmt.Sprintf(
"-smp cpus=%d,sockets=%d,cores=%d,maxcpus=%d",
cpu.Cpus, cpu.Sockets, cpu.Cores, cpu.MaxCpus,
)
if cpu.MaxCpus%2 > 0 {
return fmt.Sprintf(
"-smp cpus=%d,maxcpus=%d", cpu.Cpus, cpu.MaxCpus,
)
} else {
return fmt.Sprintf(
"-smp cpus=%d,sockets=%d,cores=%d,maxcpus=%d",
cpu.Cpus, cpu.Sockets, cpu.Cores, cpu.MaxCpus,
)
}
}
func generateCPUOption(cpu *desc.SGuestCpu) string {