diff options
| author | Peter Maydell | 2014-03-14 19:17:25 +0100 |
|---|---|---|
| committer | Peter Maydell | 2014-03-14 19:17:25 +0100 |
| commit | 03d51428e2da0188a0adea00cbd713cc1e967e7a (patch) | |
| tree | 371bbd515032a5422f8580c0f1cd7f624b0f5c88 /include | |
| parent | Update version for v2.0-rc0 (diff) | |
| parent | virtio-scsi: actually honor sense_size from configuration space (diff) | |
| download | qemu-03d51428e2da0188a0adea00cbd713cc1e967e7a.tar.gz qemu-03d51428e2da0188a0adea00cbd713cc1e967e7a.tar.xz qemu-03d51428e2da0188a0adea00cbd713cc1e967e7a.zip | |
Merge remote-tracking branch 'remotes/bonzini/scsi-next' into staging
* remotes/bonzini/scsi-next:
virtio-scsi: actually honor sense_size from configuration space
scsi: Fix migration of scsi sense data
spapr-vscsi: fix CRQ status
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/scsi/scsi.h | 1 | ||||
| -rw-r--r-- | include/migration/vmstate.h | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h index e5fc39d504..1adb54906e 100644 --- a/include/hw/scsi/scsi.h +++ b/include/hw/scsi/scsi.h @@ -31,6 +31,7 @@ typedef struct SCSISense { uint8_t ascq; } SCSISense; +#define SCSI_SENSE_BUF_SIZE_OLD 96 #define SCSI_SENSE_BUF_SIZE 252 struct SCSICommand { diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index ded8e2302f..e7e170561d 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -650,6 +650,9 @@ extern const VMStateInfo vmstate_info_bitmap; #define VMSTATE_UINT8_ARRAY(_f, _s, _n) \ VMSTATE_UINT8_ARRAY_V(_f, _s, _n, 0) +#define VMSTATE_UINT8_SUB_ARRAY(_f, _s, _start, _num) \ + VMSTATE_SUB_ARRAY(_f, _s, _start, _num, 0, vmstate_info_uint8, uint8_t) + #define VMSTATE_UINT8_2DARRAY(_f, _s, _n1, _n2) \ VMSTATE_UINT8_2DARRAY_V(_f, _s, _n1, _n2, 0) |