Skip to content

Commit cfcd7b2

Browse files
Zongmin Zhougregkh
authored andcommitted
usbip: tools: add hint when no exported devices are found
When refresh_exported_devices() finds no devices, it's helpful to inform users about potential causes. This could be due to: 1. The usbip driver module is not loaded. 2. No devices have been exported yet. Add an informational message to guide users when ndevs == 0. Also update the condition in usbip_host_driver_open() and usbip_device_driver_open() to check both ret and ndevs == 0, and change err() to info(). Message visibility by scenario: - usbipd (console mode): Show on console/serial, this allows instant visibility for debugging. - usbipd -D (daemon mode): Message logged to syslog, can keep logs for later traceability in production. Also can use "journalctl -f" to trace on console. Suggested-by: Shuah Khan <skhan@linuxfoundation.org> Signed-off-by: Zongmin Zhou <zhouzongmin@kylinos.cn> Reviewed-by: Shuah Khan <skhan@linuxfoundation.org> Link: https://patch.msgid.link/20260402083204.53179-1-min_halo@163.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent a5cc53f commit cfcd7b2

3 files changed

Lines changed: 10 additions & 6 deletions

File tree

tools/usb/usbip/libsrc/usbip_device_driver.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,9 @@ static int usbip_device_driver_open(struct usbip_host_driver *hdriver)
137137
INIT_LIST_HEAD(&hdriver->edev_list);
138138

139139
ret = usbip_generic_driver_open(hdriver);
140-
if (ret)
141-
err("please load " USBIP_CORE_MOD_NAME ".ko and "
142-
USBIP_DEVICE_DRV_NAME ".ko!");
140+
if (ret || hdriver->ndevs == 0)
141+
info("please load " USBIP_CORE_MOD_NAME ".ko and "
142+
USBIP_DEVICE_DRV_NAME ".ko");
143143

144144
return ret;
145145
}

tools/usb/usbip/libsrc/usbip_host_common.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,9 @@ static int refresh_exported_devices(struct usbip_host_driver *hdriver)
149149
}
150150
}
151151

152+
if (hdriver->ndevs == 0)
153+
info("Please load appropriate modules or export devices.");
154+
152155
return 0;
153156
}
154157

tools/usb/usbip/libsrc/usbip_host_driver.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,10 @@ static int usbip_host_driver_open(struct usbip_host_driver *hdriver)
3232
INIT_LIST_HEAD(&hdriver->edev_list);
3333

3434
ret = usbip_generic_driver_open(hdriver);
35-
if (ret)
36-
err("please load " USBIP_CORE_MOD_NAME ".ko and "
37-
USBIP_HOST_DRV_NAME ".ko!");
35+
if (ret || hdriver->ndevs == 0)
36+
info("please load " USBIP_CORE_MOD_NAME ".ko and "
37+
USBIP_HOST_DRV_NAME ".ko");
38+
3839
return ret;
3940
}
4041

0 commit comments

Comments
 (0)