diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-05-29 04:28:59 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-05-29 04:28:59 -0500 |
| commit | d501f8478a3c12f50b8cf18214795f3d7c3d94bd (patch) | |
| tree | 67c40bab5548528d8cc421d99141103b86565175 /hw | |
| parent | 24f50d7ea5896a30b0e78f68884586bb8b40ff97 (diff) | |
| parent | f4dfa67f04037c1b1a8f4e4ddc944c5ab308f35b (diff) | |
| download | qemu-d501f8478a3c12f50b8cf18214795f3d7c3d94bd.zip qemu-d501f8478a3c12f50b8cf18214795f3d7c3d94bd.tar.gz qemu-d501f8478a3c12f50b8cf18214795f3d7c3d94bd.tar.bz2 | |
Merge remote-tracking branch 'bonzini/scsi-next' into staging
* bonzini/scsi-next:
ISCSI: Switch to using READ16/WRITE16 for I/O to the LUN
ISCSI: Only call READCAPACITY16 for SBC devices, use READCAPACITY10 for MMC
ISCSI: get device type at connection time
ISCSI: change num_blocks to 64-bit
ISCSI: redo how we set up the events
scsi: declare vmstate_info_scsi_requests to be static
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/scsi-bus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index 8ab9bcd..f10f3ec 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -1561,7 +1561,7 @@ static int get_scsi_requests(QEMUFile *f, void *pv, size_t size) return 0; } -const VMStateInfo vmstate_info_scsi_requests = { +static const VMStateInfo vmstate_info_scsi_requests = { .name = "scsi-requests", .get = get_scsi_requests, .put = put_scsi_requests, |