opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 14:19:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(host): ensure scsi pci addr on add scsi disk (#24097)

Browse Source
This commit is contained in:
wanyaoqi
2026-01-19 20:16:30 +08:00
committed by GitHub
parent 8c20fb7e3d
commit 28bbdd3061
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/hostman/guestman/guesttasks.go
+17
View File
@@ -458,6 +458,14 @@ func (d *SGuestDiskSyncTask) checkDiskDriver(disk *desc.SGuestDisk) {
d.guest.Desc.VirtioScsi = &desc.SGuestVirtioScsi{
PCIDevice: desc.NewPCIDevice(*cType, "virtio-scsi-pci", "scsi"),
}
if err := d.guest.ensureDevicePciAddress(d.guest.Desc.VirtioScsi.PCIDevice, -1, nil); err != nil {
d.guest.Desc.VirtioScsi = nil
err = errors.Wrap(err, "ensureDevicePciAddress for virtio scsi device")
d.errors = append(d.errors, err)
d.syncDisksConf()
return
}
cb := func(ret string) {
log.Infof("Add scsi controller %s", ret)
d.checkDrivers = append(d.checkDrivers, DISK_DRIVER_SCSI)
@@ -482,6 +490,15 @@ func (d *SGuestDiskSyncTask) checkDiskDriver(disk *desc.SGuestDisk) {
d.guest.Desc.SataController = &desc.SGuestAhciDevice{
PCIDevice: desc.NewPCIDevice(*cType, "ahci", "ahci0"),
}
err := d.guest.ensureDevicePciAddress(d.guest.Desc.SataController.PCIDevice, -1, nil)
if err != nil {
d.guest.Desc.SataController = nil
err = errors.Wrap(err, "ensureDevicePciAddress sata controller")
d.errors = append(d.errors, err)
d.syncDisksConf()
return
}
cb := func(ret string) {
log.Infof("Add sata ahci controller %s", ret)
d.checkDrivers = append(d.checkDrivers, DISK_DRIVER_SATA)