For noiommu device, vfio core names the cdev node with prefix "noiommu-". Reviewed-by: Kevin Tian <kevin.tian@xxxxxxxxx> Tested-by: Nicolin Chen <nicolinc@xxxxxxxxxx> Tested-by: Yanting Jiang <yanting.jiang@xxxxxxxxx> Tested-by: Shameer Kolothum <shameerali.kolothum.thodi@xxxxxxxxxx> Signed-off-by: Yi Liu <yi.l.liu@xxxxxxxxx> --- drivers/vfio/vfio_main.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/vfio/vfio_main.c b/drivers/vfio/vfio_main.c index 599d551fc4b5..89720b73fa30 100644 --- a/drivers/vfio/vfio_main.c +++ b/drivers/vfio/vfio_main.c @@ -284,13 +284,14 @@ 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); + ret = vfio_device_set_group(device, type); if (ret) return ret; - ret = vfio_device_set_group(device, type); + ret = dev_set_name(&device->device, "%svfio%d", + vfio_device_is_noiommu(device) ? "noiommu-" : "", device->index); if (ret) - return ret; + goto err_out; ret = device_add(&device->device); if (ret) -- 2.34.1
