aarch64 fixes

This commit is contained in:
AlexSSD7 2023-08-30 13:32:00 +01:00
commit 97b58c722b
5 changed files with 20 additions and 19 deletions

View file

@ -81,9 +81,9 @@ func (s *Storage) BuildVMImageWithInterruptHandler(showBuilderVMDisplay bool, ov
return errors.Wrap(err, "check/download base image")
}
biosPath, err := s.CheckDownloadCPUArchSpecifics()
biosPath, err := s.CheckDownloadVMBIOS()
if err != nil {
return errors.Wrap(err, "check/download cpu arch specifics")
return errors.Wrap(err, "check/download vm bios")
}
s.logger.Info("Building VM image", "tags", constants.GetAlpineBaseImageTags(), "overwriting", removed, "dst", vmImagePath)
@ -116,7 +116,7 @@ func (s *Storage) DataDirPath() string {
return s.path
}
func (s *Storage) CheckDownloadCPUArchSpecifics() (string, error) {
func (s *Storage) CheckDownloadVMBIOS() (string, error) {
if runtime.GOARCH == "arm64" {
p, err := s.CheckDownloadAarch64EFIImage()
if err != nil {
@ -126,6 +126,8 @@ func (s *Storage) CheckDownloadCPUArchSpecifics() (string, error) {
return p, nil
}
// On x86_64, there is no requirement to supply QEMU with any BIOS images.
return "", nil
}