Merged PR 3680541: Update hcsshim master to github @ 0ab229b

This PR updates our ADO branch with our github master branch. Changes included in this PR include:

- Add a new utility tool "device-util" for use in wcow device assignment scenarios
- Add ability to assign generic devices into WCOW containers
- Add internal bindings for future job container support
- Add the ability to set the `EnableCompartmentNamespace` registry key in a UVM to access changes in GNS to fix a bug with smb shares in hypervisor isolated containers
- Fix issue for kubernetes scenario where the number of CPUs requested for a container previously was based on the host instead of on the UVM when hypervisor isolated
- Improve ContainerPlat logging for LCOW layer operations to assist in debugging

PR URL: https://msazure.visualstudio.com/DefaultCollection/ContainerPlatform/_git/Microsoft.hcsshim/pullrequest/3680541

appveyor.yml

@@ -18,6 +18,7 @@ build_script:
   - go build ./cmd/runhcs
   - go build ./cmd/tar2ext4
   - go build ./cmd/wclayer
+  - go build ./cmd/device-util
   - go build ./internal/tools/grantvmgroupaccess 
   - go build ./internal/tools/uvmboot
   - go build ./internal/tools/zapdir
@@ -33,6 +34,7 @@ artifacts:
   - path: 'containerd-shim-runhcs-v1.exe'
   - path: 'runhcs.exe'
   - path: 'tar2ext4.exe'
+  - path: 'device-util.exe'
   - path: 'wclayer.exe'
   - path: 'grantvmgroupaccess.exe'  
   - path: 'uvmboot.exe'

cmd/containerd-shim-runhcs-v1/exec_hcs.go

@@ -6,9 +6,9 @@ import (
 	"sync"
 	"time"
 
+	"github.com/Microsoft/hcsshim/internal/cmd"
 	"github.com/Microsoft/hcsshim/internal/cow"
 	"github.com/Microsoft/hcsshim/internal/guestrequest"
-	"github.com/Microsoft/hcsshim/internal/hcsoci"
 	"github.com/Microsoft/hcsshim/internal/log"
 	"github.com/Microsoft/hcsshim/internal/signals"
 	"github.com/Microsoft/hcsshim/internal/uvm"
@@ -49,7 +49,7 @@ func newHcsExec(
 	id, bundle string,
 	isWCOW bool,
 	spec *specs.Process,
-	io hcsoci.UpstreamIO) shimExec {
+	io cmd.UpstreamIO) shimExec {
 	log.G(ctx).WithFields(logrus.Fields{
 		"tid":    tid,
 		"eid":    id, // Init exec ID is always same as Task ID
@@ -118,7 +118,7 @@ type hcsExec struct {
 	// create time in order to be valid.
 	//
 	// This MUST be treated as read only in the lifetime of the exec.
-	io              hcsoci.UpstreamIO
+	io              cmd.UpstreamIO
 	processDone     chan struct{}
 	processDoneOnce sync.Once
 
@@ -129,7 +129,7 @@ type hcsExec struct {
 	pid        int
 	exitStatus uint32
 	exitedAt   time.Time
-	p          *hcsoci.Cmd
+	p          *cmd.Cmd
 
 	// exited is a wait block which waits async for the process to exit.
 	exited     chan struct{}
@@ -205,7 +205,7 @@ func (he *hcsExec) Start(ctx context.Context) (err error) {
 			}
 		}()
 	}
-	cmd := &hcsoci.Cmd{
+	cmd := &cmd.Cmd{
 		Host:   he.c,
 		Stdin:  he.io.Stdin(),
 		Stdout: he.io.Stdout(),