From: Gerd Hoffmann <kraxel@redhat.com>
Date: Fri, 26 Nov 2010 11:26:17 +0000 (+0100)
Subject: usb storage: serial number support
X-Git-Tag: v0.14.0-rc0~102^2~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4a1e1bc416e99254dcc59a689b3806775ae8dabd;p=thirdparty%2Fqemu.git

usb storage: serial number support

If a serial number is present for the drive fill it into the usb
serialnumber string descriptor.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---

diff --git a/hw/usb-msd.c b/hw/usb-msd.c
index 20ab886747c..9aa8888baef 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);