[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/24] usb storage: serial number support
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 09/24] usb storage: serial number support |
Date: |
Thu, 9 Dec 2010 13:30:12 +0100 |
If a serial number is present for the drive fill it into the usb
serialnumber string descriptor.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb-msd.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/hw/usb-msd.c b/hw/usb-msd.c
index 20ab886..9aa8888 100644
--- a/hw/usb-msd.c
+++ b/hw/usb-msd.c
@@ -482,6 +482,7 @@ static int usb_msd_initfn(USBDevice *dev)
{
MSDState *s = DO_UPCAST(MSDState, dev, dev);
BlockDriverState *bs = s->conf.bs;
+ DriveInfo *dinfo;
if (!bs) {
error_report("usb-msd: drive property not set");
@@ -500,6 +501,11 @@ static int usb_msd_initfn(USBDevice *dev)
bdrv_detach(bs, &s->dev.qdev);
s->conf.bs = NULL;
+ dinfo = drive_get_by_blockdev(bs);
+ if (dinfo && dinfo->serial) {
+ usb_desc_set_string(dev, STR_SERIALNUMBER, dinfo->serial);
+ }
+
s->dev.speed = USB_SPEED_FULL;
scsi_bus_new(&s->bus, &s->dev.qdev, 0, 1, usb_msd_command_complete);
s->scsi_dev = scsi_bus_legacy_add_drive(&s->bus, bs, 0);
--
1.7.1
- [Qemu-devel] [PATCH 00/24] usb descriptor overhaul., Gerd Hoffmann, 2010/12/09
- [Qemu-devel] [PATCH 03/24] usb serial: use new descriptor infrastructure., Gerd Hoffmann, 2010/12/09
- [Qemu-devel] [PATCH 04/24] usb storage: use new descriptor infrastructure., Gerd Hoffmann, 2010/12/09
- [Qemu-devel] [PATCH 01/24] usb: data structs and helpers for usb descriptors., Gerd Hoffmann, 2010/12/09
- [Qemu-devel] [PATCH 02/24] usb hid: use new descriptor infrastructure., Gerd Hoffmann, 2010/12/09
- [Qemu-devel] [PATCH 09/24] usb storage: serial number support,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 08/24] usb descriptors: add settable strings., Gerd Hoffmann, 2010/12/09
- [Qemu-devel] [PATCH 11/24] usb: move USB_REQ_SET_ADDRESS handling to common code, Gerd Hoffmann, 2010/12/09
- [Qemu-devel] [PATCH 05/24] usb wacom: use new descriptor infrastructure., Gerd Hoffmann, 2010/12/09
- [Qemu-devel] [PATCH 07/24] usb hub: use new descriptor infrastructure., Gerd Hoffmann, 2010/12/09
- [Qemu-devel] [PATCH 14/24] usb: create USBPortOps, move attach there., Gerd Hoffmann, 2010/12/09
- [Qemu-devel] [PATCH 06/24] usb bluetooth: use new descriptor infrastructure., Gerd Hoffmann, 2010/12/09
- [Qemu-devel] [PATCH 12/24] usb: move USB_REQ_{GET, SET}_CONFIGURATION handling to common code, Gerd Hoffmann, 2010/12/09
- [Qemu-devel] [PATCH 10/24] usb network: use new descriptor infrastructure., Gerd Hoffmann, 2010/12/09
- [Qemu-devel] [PATCH 13/24] usb: move remote wakeup handling to common code, Gerd Hoffmann, 2010/12/09
- [Qemu-devel] [PATCH 16/24] usb: add usb_wakeup() + wakeup callback to port ops, Gerd Hoffmann, 2010/12/09