summaryrefslogtreecommitdiffstats
path: root/hw/usb/dev-storage.c
diff options
context:
space:
mode:
authorAnthony Liguori2013-04-05 19:49:10 +0200
committerAnthony Liguori2013-04-05 19:49:10 +0200
commit5098699a51756f7e8934dc035112c8f8aa2a0ec3 (patch)
tree19bebb098d1cbd0b4e811f2d7ef20979ecab987a /hw/usb/dev-storage.c
parentMerge remote-tracking branch 'luiz/queue/qmp' into staging (diff)
parentqcow2: Fix L1 write error handling in qcow2_update_snapshot_refcount (diff)
downloadqemu-5098699a51756f7e8934dc035112c8f8aa2a0ec3.tar.gz
qemu-5098699a51756f7e8934dc035112c8f8aa2a0ec3.tar.xz
qemu-5098699a51756f7e8934dc035112c8f8aa2a0ec3.zip
Merge remote-tracking branch 'kwolf/for-anthony' into staging
# By Stefan Hajnoczi (4) and Kevin Wolf (3) # Via Kevin Wolf * kwolf/for-anthony: qcow2: Fix L1 write error handling in qcow2_update_snapshot_refcount qcow2: Return real error in qcow2_update_snapshot_refcount block: clean up I/O throttling wait_time code block: drop duplicated slice extension code block: keep I/O throttling slice time constant block: fix I/O throttling accounting blind spot usb-storage: Forward serial number to scsi-disk
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;
}