From b089fcec26b96fbce843b03801e0b6b4212e128f Mon Sep 17 00:00:00 2001 From: Maksim An Date: Mon, 17 Apr 2023 17:52:17 -0700 Subject: [PATCH] fix: few bugs with error shadowing Signed-off-by: Maksim An --- internal/guest/runtime/hcsv2/uvm.go | 6 ++++-- internal/uvm/create_lcow.go | 12 ++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/internal/guest/runtime/hcsv2/uvm.go b/internal/guest/runtime/hcsv2/uvm.go index 862608ab82..8770534dff 100644 --- a/internal/guest/runtime/hcsv2/uvm.go +++ b/internal/guest/runtime/hcsv2/uvm.go @@ -543,7 +543,8 @@ func (h *Host) modifyHostSettings(ctx context.Context, containerID string, req * case guestresource.ResourceTypeMappedVirtualDisk: mvd := req.Settings.(*guestresource.LCOWMappedVirtualDisk) // find the actual controller number on the bus and update the incoming request. - cNum, err := scsi.ActualControllerNumber(ctx, mvd.Controller) + var cNum uint8 + cNum, err = scsi.ActualControllerNumber(ctx, mvd.Controller) if err != nil { return err } @@ -552,7 +553,8 @@ func (h *Host) modifyHostSettings(ctx context.Context, containerID string, req * if !mvd.ReadOnly { localCtx, cancel := context.WithTimeout(ctx, time.Second*5) defer cancel() - source, err := scsi.ControllerLunToName(localCtx, mvd.Controller, mvd.Lun) + var source string + source, err = scsi.ControllerLunToName(localCtx, mvd.Controller, mvd.Lun) if err != nil { return err } diff --git a/internal/uvm/create_lcow.go b/internal/uvm/create_lcow.go index ebc0aff79e..5a8e393f80 100644 --- a/internal/uvm/create_lcow.go +++ b/internal/uvm/create_lcow.go @@ -610,14 +610,14 @@ func makeLCOWDoc(ctx context.Context, opts *OptionsLCOW, uvm *UtilityVM) (_ *hcs pmem := newPackedVPMemDevice() pmem.maxMappedDeviceCount = 1 - st, err := os.Stat(rootfsFullPath) - if err != nil { - return nil, errors.Wrapf(err, "failed to stat rootfs: %q", rootfsFullPath) + st, stErr := os.Stat(rootfsFullPath) + if stErr != nil { + return nil, errors.Wrapf(stErr, "failed to stat rootfs: %q", rootfsFullPath) } devSize := pageAlign(uint64(st.Size())) - memReg, err := pmem.Allocate(devSize) - if err != nil { - return nil, errors.Wrap(err, "failed to allocate memory for rootfs") + memReg, pErr := pmem.Allocate(devSize) + if pErr != nil { + return nil, errors.Wrap(pErr, "failed to allocate memory for rootfs") } defer func() { if err != nil {