Add vpmem mount capability to uvmboot (#1455)

anmaxvl · web-flow · commit f59b1f249e65 · 2022-07-14T12:31:55.000-07:00
Signed-off-by: Maksim An &lt;maksiman@microsoft.com&gt;
diff --git a/internal/tools/uvmboot/lcow.go b/internal/tools/uvmboot/lcow.go
@@ -30,7 +30,8 @@ const (
 	rootFSTypeArgName     = "root-fs-type"
 	vpMemMaxCountArgName  = "vpmem-max-count"
 	vpMemMaxSizeArgName   = "vpmem-max-size"
-	scsiMountsArgName     = "mount"
+	scsiMountsArgName     = "mount-scsi"
+	vpmemMountsArgName    = "mount-vpmem"
 	shareFilesArgName     = "share"
 	securityPolicyArgName = "security-policy"
 	securityHardwareFlag  = "security-hardware"
@@ -124,6 +125,10 @@ var lcowCommand = cli.Command{
 				"Value is of the form `'host,guest[,w]' where 'host' is path to the VHD, " +
 				`'guest' is the mount path inside the UVM, and 'w' sets the shared files to writeable`,
 		},
+		cli.StringSliceFlag{
+			Name:  vpmemMountsArgName,
+			Usage: "List of VHDs to VPMem mount into the UVM. Use repeat instances to add multiple. ",
+		},
 	},
 	Action: func(c *cli.Context) error {
 		runMany(c, func(id string) error {
@@ -275,6 +280,10 @@ func runLCOW(ctx context.Context, options *uvm.OptionsLCOW, c *cli.Context) erro
 		return err
 	}
 
+	if err := mountVPMem(ctx, c, vm); err != nil {
+		return err
+	}
+
 	if options.UseGuestConnection {
 		if err := execViaGcs(vm, c); err != nil {
 			return err
diff --git a/internal/tools/uvmboot/mounts.go b/internal/tools/uvmboot/mounts.go
@@ -65,6 +65,18 @@ func shareFilesLCOW(ctx context.Context, c *cli.Context, vm *uvm.UtilityVM) erro
 	return nil
 }
 
+func mountVPMem(ctx context.Context, c *cli.Context, vm *uvm.UtilityVM) error {
+	if !c.IsSet(vpmemMountsArgName) {
+		return nil
+	}
+	for _, p := range c.StringSlice(vpmemMountsArgName) {
+		if _, err := vm.AddVPMem(ctx, p); err != nil {
+			return fmt.Errorf("could not mount VPMem device: %w", err)
+		}
+	}
+	return nil
+}
+
 type mount struct {
 	host     string
 	guest    string
