motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-04 00:03:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

qdev: Rename USBDevice member devname to product_desc

Browse source 
It's not a device name, it's the USB product description string.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Markus Armbruster 2009-12-09 17:07:51 +01:00 • committed by Anthony Liguori
parent ba32edab7f
commit 0fe6d12e0b
6 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

11
hw/usb-bus.c
View file

@ -43,7 +43,7 @@ static int usb_qdev_init(DeviceState *qdev, DeviceInfo *base)
USBDeviceInfo *info = DO_UPCAST(USBDeviceInfo, qdev, base);
int rc;
pstrcpy(dev->devname, sizeof(dev->devname), qdev->info->name);
pstrcpy(dev->product_desc, sizeof(dev->product_desc), qdev->info->name);
dev->info = info;
dev->auto_attach = 1;
rc = dev->info->init(dev);
@ -131,7 +131,7 @@ static void do_attach(USBDevice *dev)
if (dev->attached) {
fprintf(stderr, "Warning: tried to attach usb device %s twice\n",
dev->devname);
dev->product_desc);
return;
}
dev->attached++;
@ -166,7 +166,7 @@ int usb_device_detach(USBDevice *dev)
if (!dev->attached) {
fprintf(stderr, "Warning: tried to detach unattached usb device %s\n",
dev->devname);
dev->product_desc);
return -1;
}
dev->attached--;
@ -228,7 +228,7 @@ static void usb_bus_dev_print(Monitor *mon, DeviceState *qdev, int indent)
monitor_printf(mon, "%*saddr %d.%d, speed %s, name %s%s\n",
indent, "", bus->busnr, dev->addr,
usb_speed(dev->speed), dev->devname,
usb_speed(dev->speed), dev->product_desc,
dev->attached ? ", attached" : "");
}
@ -249,7 +249,8 @@ void usb_info(Monitor *mon)
if (!dev)
continue;
monitor_printf(mon, " Device %d.%d, Speed %s Mb/s, Product %s\n",
bus->busnr, dev->addr, usb_speed(dev->speed), dev->devname);
bus->busnr, dev->addr, usb_speed(dev->speed),
dev->product_desc);
}
}
}