From 354b9c49dc41d0becfa8e541973d48da16e7fed0 Mon Sep 17 00:00:00 2001 From: wanyaoqi <18528551+wanyaoqi@users.noreply.github.com> Date: Sat, 27 Aug 2022 06:57:54 +0800 Subject: [PATCH] fix(host): fix panic on change cdrom succ (#14842) Signed-off-by: wanyaoqi Signed-off-by: wanyaoqi --- pkg/hostman/guestman/guesttasks.go | 3 +++ pkg/hostman/guestman/pci.go | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/hostman/guestman/guesttasks.go b/pkg/hostman/guestman/guesttasks.go index e457975efa..59e0c1dcc8 100644 --- a/pkg/hostman/guestman/guesttasks.go +++ b/pkg/hostman/guestman/guesttasks.go @@ -287,6 +287,9 @@ func (d *SGuestDiskSyncTask) changeCdromContent(cdName string) { } func (d *SGuestDiskSyncTask) OnChangeCdromContentSucc(results string) { + if d.guest.Desc.Cdrom == nil { + d.guest.Desc.Cdrom = new(desc.SGuestCdrom) + } d.guest.Desc.Cdrom.Path = *d.cdrom d.cdrom = nil d.syncDisksConf() diff --git a/pkg/hostman/guestman/pci.go b/pkg/hostman/guestman/pci.go index 5429b911fb..a08dd0b0a1 100644 --- a/pkg/hostman/guestman/pci.go +++ b/pkg/hostman/guestman/pci.go @@ -299,7 +299,6 @@ func (s *SKVMGuestInstance) initIsolatedDevices(pciRoot, pciBridge *desc.PCICont func (s *SKVMGuestInstance) initCdromDesc() { if s.Desc.Cdrom == nil { s.Desc.Cdrom = new(desc.SGuestCdrom) - return } s.archMan.GenerateCdromDesc(s.getOsname(), s.Desc.Cdrom)