opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(host): fix panic on change cdrom succ (#14842)

Browse Source 
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>

Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
This commit is contained in:
wanyaoqi
2022-08-27 06:57:54 +08:00
committed by GitHub
parent d3a6f033f4
commit 354b9c49dc
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/hostman/guestman/guesttasks.go
+3
View File
@@ -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()
pkg/hostman/guestman/pci.go
-1
View File
@@ -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)