On 05/19/2017 03:17 AM, Chen Hanxiao wrote:
> From: Chen Hanxiao <chenhanxiao@xxxxxxxxx>
>
> Some vendor id or product id may have leading zeros.
> We should show them.
>
> Signed-off-by: Chen Hanxiao <chenhanxiao@xxxxxxxxx>
Reviewed-by: Laine Stump <laine@xxxxxxxxx>
ACK and pushed (I modified the log message slightly).
(When we format USB vendor/product id's for XML, we use "%.4x" rather
than "%04x", but the effect is the same)
> ---
> src/util/virusb.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/src/util/virusb.c b/src/util/virusb.c
> index 8cd2f57..6359235 100644
> --- a/src/util/virusb.c
> +++ b/src/util/virusb.c
> @@ -221,7 +221,7 @@ virUSBDeviceFindByVendor(unsigned int vendor,
> if (list->count == 0) {
> virObjectUnref(list);
> if (!mandatory) {
> - VIR_DEBUG("Did not find USB device %x:%x",
> + VIR_DEBUG("Did not find USB device %04x:%04x",
> vendor, product);
> if (devices)
> *devices = NULL;
> @@ -229,7 +229,7 @@ virUSBDeviceFindByVendor(unsigned int vendor,
> }
>
> virReportError(VIR_ERR_INTERNAL_ERROR,
> - _("Did not find USB device %x:%x"), vendor, product);
> + _("Did not find USB device %04x:%04x"), vendor, product);
> return -1;
> }
>
> @@ -300,7 +300,7 @@ virUSBDeviceFind(unsigned int vendor,
> if (list->count == 0) {
> virObjectUnref(list);
> if (!mandatory) {
> - VIR_DEBUG("Did not find USB device %x:%x bus:%u device:%u",
> + VIR_DEBUG("Did not find USB device %04x:%04x bus:%u device:%u",
> vendor, product, bus, devno);
> if (usb)
> *usb = NULL;
> @@ -308,7 +308,7 @@ virUSBDeviceFind(unsigned int vendor,
> }
>
> virReportError(VIR_ERR_INTERNAL_ERROR,
> - _("Did not find USB device %x:%x bus:%u device:%u"),
> + _("Did not find USB device %04x:%04x bus:%u device:%u"),
> vendor, product, bus, devno);
> return -1;
> }
>
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
