From 76467f8fc5c66f223b26577542644b2fcedcaaf8 Mon Sep 17 00:00:00 2001 From: Ziteng Liu Date: Thu, 11 Jan 2024 17:31:21 +0800 Subject: [PATCH] vhost-vdpa: fix env val not show vdpaPath is now assigned a value in NewVdpaInfoProvider. Signed-off-by: Ziteng Liu --- pkg/infoprovider/vdpaInfoProvider.go | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkg/infoprovider/vdpaInfoProvider.go b/pkg/infoprovider/vdpaInfoProvider.go index e46711f40..81768c89c 100644 --- a/pkg/infoprovider/vdpaInfoProvider.go +++ b/pkg/infoprovider/vdpaInfoProvider.go @@ -39,6 +39,13 @@ func NewVdpaInfoProvider(vdpaType types.VdpaType, vdpaDev types.VdpaDevice) type dev: vdpaDev, vdpaType: vdpaType, } + if vdpaType == types.VdpaVhostType && vdpaDev != nil { + vdpaPath, err := vdpaDev.GetPath() + if err != nil { + glog.Errorf("Unexpected error when fetching the vdpa device path: %s", err) + } + vdpaInfoProvider.vdpaPath = vdpaPath + } return vdpaInfoProvider } @@ -58,20 +65,14 @@ func (vip *vdpaInfoProvider) GetDeviceSpecs() []*pluginapi.DeviceSpec { } devSpecs := make([]*pluginapi.DeviceSpec, 0) - // DeviceSpecs only required for vhost vdpa type as the - if vip.vdpaType == types.VdpaVhostType { - vdpaPath, err := vip.dev.GetPath() - if err != nil { - glog.Errorf("Unexpected error when fetching the vdpa device path: %s", err) - return nil - } + if vip.vdpaPath != "" { devSpecs = append(devSpecs, &pluginapi.DeviceSpec{ - HostPath: vdpaPath, - ContainerPath: vdpaPath, + HostPath: vip.vdpaPath, + ContainerPath: vip.vdpaPath, Permissions: "rw", }) - vip.vdpaPath = vdpaPath } + return devSpecs }