Suport vpci-class-guid in the non-containerd backend

TBBle · TBBle · commit 31e1fec950eb · 2022-03-27T13:26:47.000+11:00
IDType `vpci-class-guid` is a synonym of `class`.

Signed-off-by: Paul "TBBle" Hampson &lt;Paul.Hampson@Pobox.com&gt;
diff --git a/integration/container/devices_windows_test.go b/integration/container/devices_windows_test.go
@@ -50,12 +50,10 @@ func TestWindowsDevices(t *testing.T) {
 			expectedStdout: "/Windows/System32/HostDriverStore/FileRepository",
 		},
 		{
-			doc:                         "process/vpci-class-guid://5B45201D-F2F2-4F3B-85BB-30FF1F953599 mounted",
-			devices:                     []string{"vpci-class-guid://5B45201D-F2F2-4F3B-85BB-30FF1F953599"},
-			isolation:                   containertypes.IsolationProcess,
-			expectedStartFailure:        !testEnv.RuntimeIsWindowsContainerd(),
-			expectedStartFailureMessage: "device assignment of type 'vpci-class-guid' is not supported",
-			expectedStdout:              "/Windows/System32/HostDriverStore/FileRepository",
+			doc:            "process/vpci-class-guid://5B45201D-F2F2-4F3B-85BB-30FF1F953599 mounted",
+			devices:        []string{"vpci-class-guid://5B45201D-F2F2-4F3B-85BB-30FF1F953599"},
+			isolation:      containertypes.IsolationProcess,
+			expectedStdout: "/Windows/System32/HostDriverStore/FileRepository",
 		},
 		{
 			doc:              "hyperv/no device mounted",
diff --git a/libcontainerd/local/local_windows.go b/libcontainerd/local/local_windows.go
@@ -313,8 +313,8 @@ func (c *client) createWindows(id string, spec *specs.Spec, runtimeOptions inter
 		}
 		for _, d := range spec.Windows.Devices {
 			// Per https://github.com/microsoft/hcsshim/blob/v0.9.2/internal/uvm/virtual_device.go#L17-L18,
-			// this represents an Interface Class GUID.
-			if d.IDType != "class" {
+			// these represent an Interface Class GUID.
+			if d.IDType != "class" && d.IDType != "vpci-class-guid" {
 				return errors.Errorf("device assignment of type '%s' is not supported", d.IDType)
 			}
 			configuration.AssignedDevices = append(configuration.AssignedDevices, hcsshim.AssignedDevice{InterfaceClassGUID: d.ID})

Original file line number	Diff line number	Diff line change
`@@ -313,8 +313,8 @@ func (c client) createWindows(id string, spec specs.Spec, runtimeOptions inter`
`313`	`313`	`}`
`314`	`314`	`for _, d := range spec.Windows.Devices {`
`315`	`315`	`// Per https://github.com/microsoft/hcsshim/blob/v0.9.2/internal/uvm/virtual_device.go#L17-L18,`
`316`		`- // this represents an Interface Class GUID.`
`317`		`- if d.IDType != "class" {`
	`316`	`+ // these represent an Interface Class GUID.`
	`317`	`+ if d.IDType != "class" && d.IDType != "vpci-class-guid" {`
`318`	`318`	`return errors.Errorf("device assignment of type '%s' is not supported", d.IDType)`
`319`	`319`	`}`
`320`	`320`	`configuration.AssignedDevices = append(configuration.AssignedDevices, hcsshim.AssignedDevice{InterfaceClassGUID: d.ID})`