Patchwork usb-storage: Turn drive serial into a qdev property usb-storage.serial

login
register
mail settings
Submitter Markus Armbruster
Date June 17, 2011, 8:52 a.m.
Message ID <1308300756-29327-1-git-send-email-armbru@redhat.com>
Download mbox | patch
Permalink /patch/100773/
State New
Headers show

Comments

Markus Armbruster - June 17, 2011, 8:52 a.m.
It needs to be a qdev property, because it belongs to the drive's
guest part.  Precedence: commit a0fef654 and 6ced55a5.

Bonus: info qtree now shows the serial number.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 hw/usb-msd.c |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)
Gerd Hoffmann - June 23, 2011, 3:10 p.m.
On 06/17/11 10:52, Markus Armbruster wrote:
> It needs to be a qdev property, because it belongs to the drive's
> guest part.  Precedence: commit a0fef654 and 6ced55a5.
>
> Bonus: info qtree now shows the serial number.

Patch applied to usb queue.

thanks,
   Gerd

Patch

diff --git a/hw/usb-msd.c b/hw/usb-msd.c
index c59797b..9033843 100644
--- a/hw/usb-msd.c
+++ b/hw/usb-msd.c
@@ -51,6 +51,7 @@  typedef struct {
     SCSIRequest *req;
     SCSIBus bus;
     BlockConf conf;
+    char *serial;
     SCSIDevice *scsi_dev;
     uint32_t removable;
     int result;
@@ -531,9 +532,15 @@  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);
+    if (!s->serial) {
+        /* try to fall back to value set with legacy -drive serial=... */
+        dinfo = drive_get_by_blockdev(bs);
+        if (*dinfo->serial) {
+            s->serial = strdup(dinfo->serial);
+        }
+    }
+    if (s->serial) {
+        usb_desc_set_string(dev, STR_SERIALNUMBER, s->serial);
     }
 
     usb_desc_init(dev);
@@ -632,6 +639,7 @@  static struct USBDeviceInfo msd_info = {
     .usbdevice_init = usb_msd_init,
     .qdev.props     = (Property[]) {
         DEFINE_BLOCK_PROPERTIES(MSDState, conf),
+        DEFINE_PROP_STRING("serial", MSDState, serial),
         DEFINE_PROP_BIT("removable", MSDState, removable, 0, false),
         DEFINE_PROP_END_OF_LIST(),
     },