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

Merge pull request #19929 from swordqiu/automated-cherry-pick-of-#19928-upstream-release-3.11

Browse Source 
Automated cherry pick of #19928: fix: disable disk serial for esxi vm on release/3.10
This commit is contained in:
Zexi Li
2024-04-11 11:35:06 +08:00
committed by GitHub
parent c3e5304a6b 121e048a26
commit 9e5b1a681c
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/hostman/guestman/qemu/generate.go
+7 -5
View File
@@ -252,7 +252,7 @@ func generateInitrdOptions(drvOpt QemuOptions, initrdPath, kernel string) []stri
return opts
}
func generateDisksOptions(drvOpt QemuOptions, disks []*desc.SGuestDisk, isEncrypt, isMaster bool) []string {
func generateDisksOptions(drvOpt QemuOptions, disks []*desc.SGuestDisk, isEncrypt, isMaster bool, osName string) []string {
opts := make([]string, 0)
for _, disk := range disks {
if disk.Driver == api.DISK_DRIVER_VFIO {
@@ -264,7 +264,7 @@ func generateDisksOptions(drvOpt QemuOptions, disks []*desc.SGuestDisk, isEncryp
} else {
opts = append(opts, getDiskDriveOption(drvOpt, disk, isEncrypt))
}
opts = append(opts, getDiskDeviceOption(drvOpt, disk))
opts = append(opts, getDiskDeviceOption(drvOpt, disk, osName))
}
return opts
}
@@ -328,7 +328,7 @@ func isLocalStorage(disk *desc.SGuestDisk) bool {
}
}
func getDiskDeviceOption(optDrv QemuOptions, disk *desc.SGuestDisk) string {
func getDiskDeviceOption(optDrv QemuOptions, disk *desc.SGuestDisk, osName string) string {
diskIndex := disk.Index
diskDriver := disk.Driver
numQueues := disk.NumQueues
@@ -336,7 +336,9 @@ func getDiskDeviceOption(optDrv QemuOptions, disk *desc.SGuestDisk) string {
var opt = ""
opt += GetDiskDeviceModel(diskDriver)
opt += fmt.Sprintf(",serial=%s", strings.ReplaceAll(disk.DiskId, "-", ""))
if osName != OS_NAME_VMWARE {
opt += fmt.Sprintf(",serial=%s", strings.ReplaceAll(disk.DiskId, "-", ""))
}
opt += fmt.Sprintf(",drive=drive_%d", diskIndex)
if diskDriver == DISK_DRIVER_VIRTIO {
// virtio-blk
@@ -805,7 +807,7 @@ func GenerateStartOptions(
// generate disk options
opts = append(opts, generateDisksOptions(
drvOpt, input.GuestDesc.Disks, isEncrypt, input.GuestDesc.IsMaster)...)
drvOpt, input.GuestDesc.Disks, isEncrypt, input.GuestDesc.IsMaster, input.OsName)...)
// cdrom
opts = append(opts, generateCdromOptions(drvOpt, input.GuestDesc.Cdroms)...)