diff options
| author | Anthony Liguori | 2013-04-05 19:49:10 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2013-04-05 19:49:10 +0200 |
| commit | 5098699a51756f7e8934dc035112c8f8aa2a0ec3 (patch) | |
| tree | 19bebb098d1cbd0b4e811f2d7ef20979ecab987a /hw/scsi.h | |
| parent | Merge remote-tracking branch 'luiz/queue/qmp' into staging (diff) | |
| parent | qcow2: Fix L1 write error handling in qcow2_update_snapshot_refcount (diff) | |
| download | qemu-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/scsi.h')
| -rw-r--r-- | hw/scsi.h | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -160,7 +160,8 @@ static inline SCSIBus *scsi_bus_from_device(SCSIDevice *d) } SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, BlockDriverState *bdrv, - int unit, bool removable, int bootindex); + int unit, bool removable, int bootindex, + const char *serial); int scsi_bus_legacy_handle_cmdline(SCSIBus *bus); /* |