Merge pull request #893 from dcantah/use-computestorage

Change CreateNTFSVHD to use computestorage call
microsoft · Nov 9, 2020 · 3cc00bc · 3cc00bc
2 parents 1432f9c + 36c772f
commit 3cc00bc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 61 deletions.
diff --git a/internal/hcs/syscall.go b/internal/hcs/syscall.go
diff --git a/internal/hcs/utils.go b/internal/hcs/utils.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/Microsoft/go-winio"
 	diskutil "github.com/Microsoft/go-winio/vhd"
+	"github.com/Microsoft/hcsshim/computestorage"
 	"github.com/pkg/errors"
 	"golang.org/x/sys/windows"
 )
@@ -36,7 +37,7 @@ func makeOpenFiles(hs []syscall.Handle) (_ []io.ReadWriteCloser, err error) {
 	return fs, nil
 }
 
-// creates a VHD formatted with NTFS of size `sizeGB` at the given `vhdPath`.
+// CreateNTFSVHD creates a VHD formatted with NTFS of size `sizeGB` at the given `vhdPath`.
 func CreateNTFSVHD(ctx context.Context, vhdPath string, sizeGB uint32) (err error) {
 	if err := diskutil.CreateVhdx(vhdPath, sizeGB, 1); err != nil {
 		return errors.Wrap(err, "failed to create VHD")
@@ -53,7 +54,7 @@ func CreateNTFSVHD(ctx context.Context, vhdPath string, sizeGB uint32) (err erro
 		}
 	}()
 
-	if err := hcsFormatWritableLayerVhd(uintptr(vhd)); err != nil {
+	if err := computestorage.FormatWritableLayerVhd(ctx, windows.Handle(vhd)); err != nil {
 		return errors.Wrap(err, "failed to format VHD")
 	}
 

diff --git a/internal/hcs/zsyscall_windows.go b/internal/hcs/zsyscall_windows.go