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

fix: fetch image properties from iso properly

Browse Source
This commit is contained in:
Qiu Jian
2022-01-05 16:40:11 +08:00
parent b704adce55
commit 548d6a900f
1 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/guests.go
+34 -25
View File
@@ -1162,33 +1162,23 @@ func (manager *SGuestManager) validateCreateData(
var osProf osprofile.SOSProfile
hypervisor = input.Hypervisor
if hypervisor != api.HYPERVISOR_CONTAINER {
if len(input.Disks) == 0 {
return nil, httperrors.NewInputParameterError("No disk information provided")
if len(input.Disks) == 0 && input.Cdrom == "" {
return nil, httperrors.NewInputParameterError("No bootable disk information provided")
}
diskConfig := input.Disks[0]
diskConfig, err = parseDiskInfo(ctx, userCred, diskConfig)
if err != nil {
return nil, httperrors.NewInputParameterError("Invalid root image: %s", err)
var imgProperties map[string]string
if len(input.Disks) > 0 {
diskConfig := input.Disks[0]
diskConfig, err = parseDiskInfo(ctx, userCred, diskConfig)
if err != nil {
return nil, httperrors.NewInputParameterError("Invalid root image: %s", err)
}
input.Disks[0] = diskConfig
imgProperties = diskConfig.ImageProperties
if imgProperties[imageapi.IMAGE_DISK_FORMAT] == "iso" {
return nil, httperrors.NewInputParameterError("System disk does not support iso image, please consider using cdrom parameter")
}
}
// if len(diskConfig.Backend) == 0 {
// diskConfig.Backend = STORAGE_LOCAL
// }
// rootStorageType = diskConfig.Backend
input.Disks[0] = diskConfig
imgProperties := diskConfig.ImageProperties
imgSupportUEFI := imgProperties[imageapi.IMAGE_UEFI_SUPPORT] == "true"
imgIsWindows := imgProperties[imageapi.IMAGE_OS_TYPE] == "Windows"
if imgSupportUEFI && imgIsWindows && len(input.IsolatedDevices) > 0 {
input.Bios = "UEFI" // windows gpu passthrough
}
if imgProperties[imageapi.IMAGE_DISK_FORMAT] == "iso" {
return nil, httperrors.NewInputParameterError("System disk does not support iso image, please consider using cdrom parameter")
}
if input.Cdrom != "" {
cdromStr := input.Cdrom
image, err := parseIsoInfo(ctx, userCred, cdromStr)
@@ -1201,6 +1191,25 @@ func (manager *SGuestManager) validateCreateData(
}
}
imgSupportUEFI := imgProperties[imageapi.IMAGE_UEFI_SUPPORT] == "true"
// imgIsWindows := imgProperties[imageapi.IMAGE_OS_TYPE] == "Windows"
// if imgSupportUEFI && imgIsWindows && len(input.IsolatedDevices) > 0 {
// input.Bios = "UEFI" // windows gpu passthrough
// }
if imgSupportUEFI {
if len(input.Bios) == 0 {
input.Bios = "UEFI"
} else if input.Bios != "UEFI" {
return nil, httperrors.NewInputParameterError("UEFI image requires UEFI boot mode")
}
} else {
// not UEFI or not detectable
if input.Bios == "UEFI" {
return nil, httperrors.NewInputParameterError("UEFI boot mode requires UEFI image")
}
}
if arch := imgProperties["os_arch"]; strings.Contains(arch, "aarch") {
input.OsArch = apis.OS_ARCH_AARCH64
}