Add dual return

pkg/resources/vfioResource.go

@@ -15,8 +15,6 @@
 package resources
 
 import (
-	"strings"
-
 	"github.com/golang/glog"
 	"github.com/intel/sriov-network-device-plugin/pkg/types"
 	"github.com/intel/sriov-network-device-plugin/pkg/utils"
@@ -52,13 +50,13 @@ func (rp *vfioResource) GetDeviceSpecs(pciAddr string) []*pluginapi.DeviceSpec {
 		Permissions:   "mrw",
 	})
 
-	vfioDev, err := utils.GetVFIODeviceFile(pciAddr)
+	vfioDevHost, vfioDevContainer, err := utils.GetVFIODeviceFile(pciAddr)
 	if err != nil {
 		glog.Errorf("GetDeviceSpecs(): error getting vfio device file for device: %s, %s", pciAddr, err.Error())
 	} else {
 		devSpecs = append(devSpecs, &pluginapi.DeviceSpec{
-			HostPath:      vfioDev,
-			ContainerPath: strings.Replace(vfioDev, "noiommu-", "", 1),
+			HostPath:      vfioDevHost,
+			ContainerPath: vfioDevContainer,
 			Permissions:   "mrw",
 		})
 	}

pkg/utils/utils.go

@@ -259,7 +259,7 @@ func ValidResourceName(name string) bool {
 }
 
 // GetVFIODeviceFile returns a vfio device files for vfio-pci bound PCI device's PCI address
-func GetVFIODeviceFile(dev string) (devFile string, err error) {
+func GetVFIODeviceFile(dev string) (devFileHost string, devFileContainer string, err error) {
 	// Get iommu group for this device
 	devPath := filepath.Join(sysBusPci, dev)
 	_, err = os.Lstat(devPath)
@@ -290,6 +290,8 @@ func GetVFIODeviceFile(dev string) (devFile string, err error) {
 		err = fmt.Errorf("GetVFIODeviceFile(): error reading symlink to iommu_group %v", err)
 		return
 	}
+	devFileContainer = filepath.Join("/dev/vfio", filepath.Base(linkName))
+	devFileHost = devFileContainer
 
 	// Get a file path to the iommu group name
 	namePath := filepath.Join(linkName, "name")
@@ -302,9 +304,9 @@ func GetVFIODeviceFile(dev string) (devFile string, err error) {
 		// if the iommu group name == vfio-noiommu then we are in a VM, adjust path to vfio device
 		if vName == "vfio-noiommu" {
 			linkName = filepath.Join(filepath.Dir(linkName), "noiommu-"+filepath.Base(linkName))
+			devFileHost = filepath.Join("/dev/vfio", filepath.Base(linkName))
 		}
 	}
-	devFile = filepath.Join("/dev/vfio", filepath.Base(linkName))
 
 	return
 }

pkg/utils/utils_test.go

@@ -296,8 +296,9 @@ var _ = Describe("In the utils package", func() {
 	DescribeTable("getting VFIO device file",
 		func(fs *FakeFilesystem, device, expected string, shouldFail bool) {
 			defer fs.Use()()
-			actual, err := GetVFIODeviceFile(device)
-			Expect(actual).To(Equal(expected))
+			//TODO: adapt test to running in a virtual environment
+			actualHost, _, err := GetVFIODeviceFile(device)
+			Expect(actualHost).To(Equal(expected))
 			assertShouldFail(err, shouldFail)
 		},
 		Entry("could not get directory information for device",