CCv0: Merge main into CCv0 branch

Merge remote-tracking branch 'upstream/main' into CCv0

Fixes: #5327
Signed-off-by: Georgina Kinge <georgina.kinge@ibm.com>

src/runtime/pkg/device/drivers/block.go

@@ -60,6 +60,12 @@ func (device *BlockDevice) Attach(ctx context.Context, devReceiver api.DeviceRec
 		return err
 	}
 
+	hypervisorType := devReceiver.GetHypervisorType()
+	if hypervisorType == "acrn" {
+		deviceLogger().Debug("Special casing for ACRN to increment BlockIndex")
+		index = index + 1
+	}
+
 	drive := &config.BlockDrive{
 		File:     device.DeviceInfo.HostPath,
 		Format:   "raw",