For noiommu device, vfio core names the cdev node with prefix "noiommu-".

Reviewed-by: Kevin Tian <kevin.t...@intel.com>
Tested-by: Nicolin Chen <nicol...@nvidia.com>
Tested-by: Yanting Jiang <yanting.ji...@intel.com>
Signed-off-by: Yi Liu <yi.l....@intel.com>
---
 drivers/vfio/vfio_main.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/vfio/vfio_main.c b/drivers/vfio/vfio_main.c
index 989c40a49171..0337d1ace716 100644
--- a/drivers/vfio/vfio_main.c
+++ b/drivers/vfio/vfio_main.c
@@ -269,16 +269,17 @@ static int __vfio_register_dev(struct vfio_device *device,
        if (!device->dev_set)
                vfio_assign_device_set(device, device);
 
-       ret = dev_set_name(&device->device, "vfio%d", device->index);
-       if (ret)
-               return ret;
-
        ret = vfio_device_set_group(device, type);
        if (ret)
                return ret;
 
        vfio_device_set_noiommu(device);
 
+       ret = dev_set_name(&device->device, "%svfio%d",
+                          device->noiommu ? "noiommu-" : "", device->index);
+       if (ret)
+               goto err_out;
+
        ret = device_add(&device->device);
        if (ret)
                goto err_out;
-- 
2.34.1

Reply via email to