Commit cfcd7b29 authored by Zongmin Zhou's avatar Zongmin Zhou Committed by Greg Kroah-Hartman
Browse files

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: default avatarShuah Khan <skhan@linuxfoundation.org>
Signed-off-by: default avatarZongmin Zhou <zhouzongmin@kylinos.cn>
Reviewed-by: default avatarShuah Khan <skhan@linuxfoundation.org>
Link: https://patch.msgid.link/20260402083204.53179-1-min_halo@163.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a5cc53f0

tools/usb/usbip/libsrc/usbip_device_driver.c

+3 −3
Original line number Diff line number Diff line
@@ -137,9 +137,9 @@ static int usbip_device_driver_open(struct usbip_host_driver *hdriver) 
	INIT_LIST_HEAD(&hdriver->edev_list);



	ret = usbip_generic_driver_open(hdriver);

	if (ret)

		err("please load " USBIP_CORE_MOD_NAME ".ko and "

		    USBIP_DEVICE_DRV_NAME ".ko!");

	if (ret || hdriver->ndevs == 0)

		info("please load " USBIP_CORE_MOD_NAME ".ko and "

		     USBIP_DEVICE_DRV_NAME ".ko");



	return ret;

}

tools/usb/usbip/libsrc/usbip_host_common.c

+3 −0
Original line number Diff line number Diff line
@@ -149,6 +149,9 @@ static int refresh_exported_devices(struct usbip_host_driver *hdriver) 
		}

	}



	if (hdriver->ndevs == 0)

		info("Please load appropriate modules or export devices.");



	return 0;

}

tools/usb/usbip/libsrc/usbip_host_driver.c

+4 −3
Original line number Diff line number Diff line
@@ -32,9 +32,10 @@ static int usbip_host_driver_open(struct usbip_host_driver *hdriver) 
	INIT_LIST_HEAD(&hdriver->edev_list);



	ret = usbip_generic_driver_open(hdriver);

	if (ret)

		err("please load " USBIP_CORE_MOD_NAME ".ko and "

		    USBIP_HOST_DRV_NAME ".ko!");

	if (ret || hdriver->ndevs == 0)

		info("please load " USBIP_CORE_MOD_NAME ".ko and "

		     USBIP_HOST_DRV_NAME ".ko");



	return ret;

}