summary refs log tree commit diff stats
path: root/hw/usb/dev-storage.c
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2013-04-03 12:41:46 +0200
committerKevin Wolf <kwolf@redhat.com>2013-04-05 18:58:05 +0200
commit76534da749ceb3b4c13ec09b173bcf6d6c2e36d4 (patch)
treea3bb27ce98ab5356b05eca7a6960093468763840 /hw/usb/dev-storage.c
parentd05ef160453e98546a4197496dc8a3cb2defac53 (diff)
downloadfocaccia-qemu-76534da749ceb3b4c13ec09b173bcf6d6c2e36d4.tar.gz
focaccia-qemu-76534da749ceb3b4c13ec09b173bcf6d6c2e36d4.zip
usb-storage: Forward serial number to scsi-disk
usb-storage takes care to fetch the USB serial number from -drive
options, but it neglected to pass its own 'serial' property to the
scsi-disk it creates. With this patch, the 'serial' qdev property and
the 'serial' option in -drive behave the same and correctly apply the
serial number on both USB and SCSI level.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/usb/dev-storage.c')
-rw-r--r--hw/usb/dev-storage.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c
index d3f01aa2a7..21651b3637 100644
--- a/hw/usb/dev-storage.c
+++ b/hw/usb/dev-storage.c
@@ -625,7 +625,7 @@ static int usb_msd_initfn_storage(USBDevice *dev)
     usb_desc_init(dev);
     scsi_bus_new(&s->bus, &s->dev.qdev, &usb_msd_scsi_info_storage);
     scsi_dev = scsi_bus_legacy_add_drive(&s->bus, bs, 0, !!s->removable,
-                                            s->conf.bootindex);
+                                            s->conf.bootindex, s->serial);
     if (!scsi_dev) {
         return -1;
     }