aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorFam Zheng <famz@redhat.com>2014-03-06 16:26:02 +0800
committerPaolo Bonzini <pbonzini@redhat.com>2014-03-14 10:06:55 +0100
commit2e323f03bfa323636552b386c982412944ff86ae (patch)
tree15b053442320d9bdab701b8616f238b891c49f25 /include
parent22956a3755749b9cf6375ad024d58c1d277100bf (diff)
downloadqemu-2e323f03bfa323636552b386c982412944ff86ae.zip
qemu-2e323f03bfa323636552b386c982412944ff86ae.tar.gz
qemu-2e323f03bfa323636552b386c982412944ff86ae.tar.bz2
scsi: Fix migration of scsi sense data
c5f52875 changed the size of sense array in vmstate_scsi_device by mistake. This patch restores the old size, and add a subsection for the remaining part of the buffer size. So that migration is not broken. Signed-off-by: Fam Zheng <famz@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/hw/scsi/scsi.h1
-rw-r--r--include/migration/vmstate.h3
2 files changed, 4 insertions, 0 deletions
diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h
index e5fc39d..1adb549 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 ded8e23..e7e1705 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)