Automated cherry pick of #22527: feat(region,host,host-deployer): support set uefi boot order

build/docker/Dockerfile.host-deployer

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/yunionio/host-deployer-base:1.4.9
+FROM registry.cn-beijing.aliyuncs.com/yunionio/host-deployer-base:1.4.10
 
 MAINTAINER "Yaoqi Wan [email protected]"
 

cmd/container-examples/create_steam.go

@@ -1,3 +1,17 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package main
 
 import (

pkg/apis/compute/guest_const.go

@@ -261,6 +261,9 @@ const (
 	VM_VIDEO_STANDARD = "std"
 	VM_VIDEO_QXL      = "qxl"
 	VM_VIDEO_VIRTIO   = "virtio"
+
+	VM_BOOT_MODE_BIOS = "BIOS"
+	VM_BOOT_MODE_UEFI = "UEFI"
 )
 
 var VM_RUNNING_STATUS = []string{VM_START_START, VM_STARTING, VM_RUNNING, VM_BLOCK_STREAM, VM_BLOCK_STREAM_FAIL}

pkg/compute/guestdrivers/kvm.go

@@ -666,6 +666,9 @@ func (self *SKVMGuestDriver) RequestSyncConfigOnHost(ctx context.Context, guest
 	if fw_only, _ := task.GetParams().Bool("fw_only"); fw_only {
 		body.Add(jsonutils.JSONTrue, "fw_only")
 	}
+	if setUefiBootOrder, _ := task.GetParams().Bool("set_uefi_boot_order"); setUefiBootOrder {
+		body.Add(jsonutils.JSONTrue, "set_uefi_boot_order")
+	}
 	url := fmt.Sprintf("%s/servers/%s/sync", host.ManagerUri, guest.Id)
 	header := self.getTaskRequestHeader(task)
 	_, _, err = httputils.JSONRequest(httputils.GetDefaultClient(), ctx, "POST", url, header, body, false)

pkg/compute/models/guest_actions.go

@@ -6394,6 +6394,14 @@ func (self *SGuest) PerformSetBootIndex(ctx context.Context, userCred mcclient.T
 		}
 	}
 
+	if self.Bios == api.VM_BOOT_MODE_UEFI {
+		data := jsonutils.NewDict()
+		data.Set("set_uefi_boot_order", jsonutils.JSONTrue)
+		if err := self.startSyncTask(ctx, userCred, false, "", data); err != nil {
+			return nil, err
+		}
+	}
+
 	return nil, nil
 }
 

pkg/hostman/guestman/guestman.go

@@ -1072,7 +1072,8 @@ func (m *SGuestManager) GuestSync(ctx context.Context, params interface{}) (json
 		}
 
 		fwOnly := jsonutils.QueryBoolean(syncParams.Body, "fw_only", false)
-		return guest.SyncConfig(ctx, guestDesc, fwOnly)
+		setUefiBootOrder := jsonutils.QueryBoolean(syncParams.Body, "set_uefi_boot_order", false)
+		return guest.SyncConfig(ctx, guestDesc, fwOnly, setUefiBootOrder)
 	}
 	return nil, nil
 }

pkg/hostman/guestman/pod.go

@@ -1069,7 +1069,7 @@ func (s *sPodGuestInstance) PostLoad(m *SGuestManager) error {
 	return LoadGuestCpuset(m, s)
 }
 
-func (s *sPodGuestInstance) SyncConfig(ctx context.Context, guestDesc *desc.SGuestDesc, fwOnly bool) (jsonutils.JSONObject, error) {
+func (s *sPodGuestInstance) SyncConfig(ctx context.Context, guestDesc *desc.SGuestDesc, fwOnly, setUefiBootOrder bool) (jsonutils.JSONObject, error) {
 	if err := SaveDesc(s, guestDesc); err != nil {
 		return nil, errors.Wrap(err, "SaveDesc")
 	}

pkg/hostman/guestman/qemu-kvm.go

@@ -2516,9 +2516,7 @@ func (s *SKVMGuestInstance) onNicChange(oldNic, newNic *desc.SGuestNetwork) erro
 	return nil
 }
 
-func (s *SKVMGuestInstance) SyncConfig(
-	ctx context.Context, guestDesc *desc.SGuestDesc, fwOnly bool,
-) (jsonutils.JSONObject, error) {
+func (s *SKVMGuestInstance) SyncConfig(ctx context.Context, guestDesc *desc.SGuestDesc, fwOnly, setUefiBootOrder bool) (jsonutils.JSONObject, error) {
 	var delDisks, addDisks []*desc.SGuestDisk
 	var delNetworks, addNetworks []*desc.SGuestNetwork
 	var changedNetworks [][2]*desc.SGuestNetwork
@@ -2549,6 +2547,12 @@ func (s *SKVMGuestInstance) SyncConfig(
 	}
 
 	if !s.IsRunning() {
+		if setUefiBootOrder && s.getBios() == api.VM_BOOT_MODE_UEFI {
+			if err := s.setUefiBootOrder(ctx); err != nil {
+				log.Errorf("failed set uefi boot order %s", err)
+				return nil, errors.Wrap(err, "setUefiBootOrder")
+			}
+		}
 		return nil, nil
 	}
 
@@ -2598,6 +2602,13 @@ func (s *SKVMGuestInstance) SyncConfig(
 			}
 		}
 
+		if setUefiBootOrder && s.getBios() == api.VM_BOOT_MODE_UEFI {
+			if err := s.setUefiBootOrder(ctx); err != nil {
+				log.Errorf("failed set uefi boot order %s", err)
+				errs = append(errs, err)
+			}
+		}
+
 		if len(errs) == 0 {
 			hostutils.TaskComplete(ctx, nil)
 		} else {

pkg/hostman/guestman/qemu-kvmhelper.go

@@ -15,6 +15,7 @@
 package guestman
 
 import (
+	"context"
 	"fmt"
 	"net"
 	"path"
@@ -36,6 +37,9 @@ import (
 	"yunion.io/x/onecloud/pkg/hostman/guestman/desc"
 	"yunion.io/x/onecloud/pkg/hostman/guestman/qemu"
 	qemucerts "yunion.io/x/onecloud/pkg/hostman/guestman/qemu/certs"
+	deployapi "yunion.io/x/onecloud/pkg/hostman/hostdeployer/apis"
+	"yunion.io/x/onecloud/pkg/hostman/hostdeployer/deployclient"
+	"yunion.io/x/onecloud/pkg/hostman/hostdeployer/uefi"
 	"yunion.io/x/onecloud/pkg/hostman/monitor"
 	"yunion.io/x/onecloud/pkg/hostman/options"
 	"yunion.io/x/onecloud/pkg/hostman/storageman"
@@ -244,7 +248,7 @@ func (s *SKVMGuestInstance) getMachine() string {
 func (s *SKVMGuestInstance) getBios() string {
 	bios := s.Desc.Bios
 	if bios == "" {
-		bios = "bios"
+		bios = api.VM_BOOT_MODE_BIOS
 	}
 	return bios
 }
@@ -499,6 +503,7 @@ function nic_mtu() {
 	if s.Desc.Bios == qemu.BIOS_UEFI {
 		if len(input.OVMFPath) == 0 {
 			input.OVMFPath = options.HostOptions.OvmfPath
+			input.OVMFVarsPath = options.HostOptions.OvmfVarsPath
 		}
 	}
 
@@ -1114,3 +1119,69 @@ func (s *SKVMGuestInstance) vfioDevCount() int {
 	}
 	return res
 }
+
+func (s *SKVMGuestInstance) getOvmfVarsPath() string {
+	return path.Join(s.HomeDir(), "OVMF_VARS.fd")
+}
+
+func (s *SKVMGuestInstance) getDiskBootOrderType(driver string) uefi.OvmfDevicePathType {
+	switch driver {
+	case qemu.DISK_DRIVER_VIRTIO:
+		return uefi.DEVICE_TYPE_PCI
+	case qemu.DISK_DRIVER_SCSI, qemu.DISK_DRIVER_PVSCSI:
+		return uefi.DEVICE_TYPE_SCSI
+	case qemu.DISK_DRIVER_IDE:
+		if s.manager.host.IsAarch64() {
+			return uefi.DEVICE_TYPE_SCSI
+		}
+		return uefi.DEVICE_TYPE_IDE
+	case qemu.DISK_DRIVER_SATA:
+		if s.manager.host.IsAarch64() {
+			return uefi.DEVICE_TYPE_SCSI
+		}
+		return uefi.DEVICE_TYPE_SATA
+	}
+	return uefi.DEVICE_TYPE_UNKNOWN
+}
+
+func (s *SKVMGuestInstance) getCdromBootOrder() uefi.OvmfDevicePathType {
+	if s.manager.host.IsAarch64() {
+		return uefi.DEVICE_TYPE_SCSI_CDROM
+	}
+	return uefi.DEVICE_TYPE_CDROM
+}
+
+func (s *SKVMGuestInstance) setUefiBootOrder(ctx context.Context) error {
+	params := &deployapi.OvmfBootOrderParams{
+		OvmfVarsPath: s.getOvmfVarsPath(),
+	}
+	devs := make([]*deployapi.BootDevices, 0)
+	for i := range s.Desc.Cdroms {
+		if s.Desc.Cdroms[i].BootIndex == nil || *s.Desc.Disks[i].BootIndex < 0 {
+			continue
+		}
+		dev := &deployapi.BootDevices{
+			BootOrder:   int32(*s.Desc.Cdroms[i].BootIndex),
+			AttachOrder: int32(s.Desc.Cdroms[i].Ordinal),
+			DevType:     int32(s.getCdromBootOrder()),
+		}
+		devs = append(devs, dev)
+	}
+	for i := range s.Desc.Disks {
+		if s.Desc.Disks[i].BootIndex == nil || *s.Desc.Disks[i].BootIndex < 0 {
+			continue
+		}
+		dev := &deployapi.BootDevices{
+			BootOrder:   int32(*s.Desc.Disks[i].BootIndex),
+			AttachOrder: int32(s.Desc.Disks[i].Index),
+			DevType:     int32(s.getDiskBootOrderType(s.Desc.Disks[i].Driver)),
+		}
+		devs = append(devs, dev)
+	}
+	params.Devs = devs
+	_, err := deployclient.GetDeployClient().SetOvmfBootOrder(ctx, params)
+	if err != nil {
+		return errors.Wrap(err, "SetOvmfBootOrder")
+	}
+	return nil
+}

pkg/hostman/guestman/qemu/generate.go

@@ -665,6 +665,7 @@ type GenerateStartOptionsInput struct {
 	OVNIntegrationBridge string
 	Devices              []string
 	OVMFPath             string
+	OVMFVarsPath         string
 	VNCPort              uint
 	VNCPassword          bool
 	EnableLog            bool
@@ -763,7 +764,7 @@ func GenerateStartOptions(
 		if input.OVMFPath == "" {
 			return "", errors.Errorf("input OVMF path is empty")
 		}
-		fmOpt, err := drvOpt.BIOS(input.OVMFPath, input.HomeDir)
+		fmOpt, err := drvOpt.BIOS(input.OVMFPath, input.OVMFVarsPath, input.HomeDir)
 		if err != nil {
 			return "", errors.Wrap(err, "bios option")
 		}

pkg/hostman/guestman/qemu/qemu.go

@@ -97,7 +97,7 @@ type QemuOptions interface {
 	MemDev(sizeMB uint64) string
 	MemFd(sizeMB uint64) string
 	Boot(order *string, enableMenu bool) string
-	BIOS(ovmfPath, homedir string) (string, error)
+	BIOS(ovmfPath, ovmfVarsPath, homedir string) (string, error)
 	Device(devStr string) string
 	Drive(driveStr string) string
 	Chardev(backend string, id string, name string) string
@@ -272,17 +272,21 @@ func (o baseOptions) Boot(order *string, enableMenu bool) string {
 	return fmt.Sprintf("-boot %s", strings.Join(opts, ","))
 }
 
-func (o baseOptions) BIOS(ovmfPath, homedir string) (string, error) {
-	ovmfVarsPath := path.Join(homedir, "OVMF_VARS.fd")
-	if !fileutils2.Exists(ovmfVarsPath) {
-		err := procutils.NewRemoteCommandAsFarAsPossible("cp", "-f", ovmfPath, ovmfVarsPath).Run()
+func (o baseOptions) BIOS(ovmfPath, ovmfVarsPath, homedir string) (string, error) {
+	if ovmfVarsPath == "" || !fileutils2.Exists(ovmfVarsPath) {
+		ovmfVarsPath = ovmfPath
+	}
+
+	destOvmfVarsPath := path.Join(homedir, "OVMF_VARS.fd")
+	if !fileutils2.Exists(destOvmfVarsPath) {
+		err := procutils.NewRemoteCommandAsFarAsPossible("cp", "-f", ovmfVarsPath, destOvmfVarsPath).Run()
 		if err != nil {
 			return "", errors.Wrap(err, "failed copy ovmf vars")
 		}
 	}
 	return fmt.Sprintf(
 		"-drive if=pflash,format=raw,unit=0,file=%s,readonly=on -drive if=pflash,format=raw,unit=1,file=%s",
-		ovmfPath, ovmfVarsPath,
+		ovmfPath, destOvmfVarsPath,
 	), nil
 }
 

pkg/hostman/guestman/runtime.go

@@ -70,7 +70,7 @@ type GuestRuntimeInstance interface {
 
 	LoadDesc() error
 	PostLoad(m *SGuestManager) error
-	SyncConfig(ctx context.Context, guestDesc *desc.SGuestDesc, fwOnly bool) (jsonutils.JSONObject, error)
+	SyncConfig(ctx context.Context, guestDesc *desc.SGuestDesc, fwOnly, setUefiBootOrder bool) (jsonutils.JSONObject, error)
 	DoSnapshot(ctx context.Context, params *SDiskSnapshot) (jsonutils.JSONObject, error)
 	DeleteSnapshot(ctx context.Context, params *SDeleteDiskSnapshot) (jsonutils.JSONObject, error)
 	OnlineResizeDisk(ctx context.Context, disk storageman.IDisk, sizeMB int64)