* [Qemu-devel] [PATCH] scsi: Fix migration of scsi sense data
@ 2014-03-06 8:26 Fam Zheng
2014-03-06 8:42 ` Paolo Bonzini
0 siblings, 1 reply; 4+ messages in thread
From: Fam Zheng @ 2014-03-06 8:26 UTC (permalink / raw)
To: qemu-devel
Cc: Paolo Bonzini, Juan Quintela, Gerd Hoffmann, Andreas Färber
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>
---
hw/scsi/scsi-bus.c | 30 +++++++++++++++++++++++++++++-
include/hw/scsi/scsi.h | 1 +
include/migration/vmstate.h | 3 +++
3 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c
index 50a0acf..eaad925 100644
--- a/hw/scsi/scsi-bus.c
+++ b/hw/scsi/scsi-bus.c
@@ -1905,6 +1905,26 @@ static const VMStateInfo vmstate_info_scsi_requests = {
.put = put_scsi_requests,
};
+static bool scsi_sense_state_needed(void *opaque)
+{
+ SCSIDevice *s = opaque;
+
+ return s->sense_len > SCSI_SENSE_BUF_SIZE_OLD;
+}
+
+static const VMStateDescription vmstate_scsi_sense_state = {
+ .name = "SCSIDevice/sense",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .minimum_version_id_old = 1,
+ .fields = (VMStateField []) {
+ VMSTATE_UINT8_SUB_ARRAY(sense, SCSIDevice,
+ SCSI_SENSE_BUF_SIZE_OLD,
+ SCSI_SENSE_BUF_SIZE - SCSI_SENSE_BUF_SIZE_OLD),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
const VMStateDescription vmstate_scsi_device = {
.name = "SCSIDevice",
.version_id = 1,
@@ -1915,7 +1935,7 @@ const VMStateDescription vmstate_scsi_device = {
VMSTATE_UINT8(unit_attention.asc, SCSIDevice),
VMSTATE_UINT8(unit_attention.ascq, SCSIDevice),
VMSTATE_BOOL(sense_is_ua, SCSIDevice),
- VMSTATE_UINT8_ARRAY(sense, SCSIDevice, SCSI_SENSE_BUF_SIZE),
+ VMSTATE_UINT8_SUB_ARRAY(sense, SCSIDevice, 0, SCSI_SENSE_BUF_SIZE_OLD),
VMSTATE_UINT32(sense_len, SCSIDevice),
{
.name = "requests",
@@ -1927,6 +1947,14 @@ const VMStateDescription vmstate_scsi_device = {
.offset = 0,
},
VMSTATE_END_OF_LIST()
+ },
+ .subsections = (VMStateSubsection []) {
+ {
+ .vmsd = &vmstate_scsi_sense_state,
+ .needed = scsi_sense_state_needed,
+ }, {
+ /* empty */
+ }
}
};
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)
--
1.9.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] scsi: Fix migration of scsi sense data
2014-03-06 8:26 [Qemu-devel] [PATCH] scsi: Fix migration of scsi sense data Fam Zheng
@ 2014-03-06 8:42 ` Paolo Bonzini
2014-03-14 5:58 ` Fam Zheng
0 siblings, 1 reply; 4+ messages in thread
From: Paolo Bonzini @ 2014-03-06 8:42 UTC (permalink / raw)
To: Fam Zheng, qemu-devel; +Cc: Gerd Hoffmann, Andreas Färber, Juan Quintela
Il 06/03/2014 09:26, Fam Zheng ha scritto:
> 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>
> ---
> hw/scsi/scsi-bus.c | 30 +++++++++++++++++++++++++++++-
> include/hw/scsi/scsi.h | 1 +
> include/migration/vmstate.h | 3 +++
> 3 files changed, 33 insertions(+), 1 deletion(-)
>
> diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c
> index 50a0acf..eaad925 100644
> --- a/hw/scsi/scsi-bus.c
> +++ b/hw/scsi/scsi-bus.c
> @@ -1905,6 +1905,26 @@ static const VMStateInfo vmstate_info_scsi_requests = {
> .put = put_scsi_requests,
> };
>
> +static bool scsi_sense_state_needed(void *opaque)
> +{
> + SCSIDevice *s = opaque;
> +
> + return s->sense_len > SCSI_SENSE_BUF_SIZE_OLD;
> +}
> +
> +static const VMStateDescription vmstate_scsi_sense_state = {
> + .name = "SCSIDevice/sense",
> + .version_id = 1,
> + .minimum_version_id = 1,
> + .minimum_version_id_old = 1,
> + .fields = (VMStateField []) {
> + VMSTATE_UINT8_SUB_ARRAY(sense, SCSIDevice,
> + SCSI_SENSE_BUF_SIZE_OLD,
> + SCSI_SENSE_BUF_SIZE - SCSI_SENSE_BUF_SIZE_OLD),
> + VMSTATE_END_OF_LIST()
> + }
> +};
> +
> const VMStateDescription vmstate_scsi_device = {
> .name = "SCSIDevice",
> .version_id = 1,
> @@ -1915,7 +1935,7 @@ const VMStateDescription vmstate_scsi_device = {
> VMSTATE_UINT8(unit_attention.asc, SCSIDevice),
> VMSTATE_UINT8(unit_attention.ascq, SCSIDevice),
> VMSTATE_BOOL(sense_is_ua, SCSIDevice),
> - VMSTATE_UINT8_ARRAY(sense, SCSIDevice, SCSI_SENSE_BUF_SIZE),
> + VMSTATE_UINT8_SUB_ARRAY(sense, SCSIDevice, 0, SCSI_SENSE_BUF_SIZE_OLD),
> VMSTATE_UINT32(sense_len, SCSIDevice),
> {
> .name = "requests",
> @@ -1927,6 +1947,14 @@ const VMStateDescription vmstate_scsi_device = {
> .offset = 0,
> },
> VMSTATE_END_OF_LIST()
> + },
> + .subsections = (VMStateSubsection []) {
> + {
> + .vmsd = &vmstate_scsi_sense_state,
> + .needed = scsi_sense_state_needed,
> + }, {
> + /* empty */
> + }
> }
> };
>
> 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)
>
>
Looks good, thanks! I'll apply to scsi-next after a little more testing.
Paolo
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] scsi: Fix migration of scsi sense data
2014-03-06 8:42 ` Paolo Bonzini
@ 2014-03-14 5:58 ` Fam Zheng
2014-03-14 12:38 ` Paolo Bonzini
0 siblings, 1 reply; 4+ messages in thread
From: Fam Zheng @ 2014-03-14 5:58 UTC (permalink / raw)
To: Paolo Bonzini
Cc: Gerd Hoffmann, qemu-devel, Andreas Färber, Juan Quintela
On Thu, 03/06 09:42, Paolo Bonzini wrote:
> Il 06/03/2014 09:26, Fam Zheng ha scritto:
> >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>
> >---
> > hw/scsi/scsi-bus.c | 30 +++++++++++++++++++++++++++++-
> > include/hw/scsi/scsi.h | 1 +
> > include/migration/vmstate.h | 3 +++
> > 3 files changed, 33 insertions(+), 1 deletion(-)
> >
> >diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c
> >index 50a0acf..eaad925 100644
> >--- a/hw/scsi/scsi-bus.c
> >+++ b/hw/scsi/scsi-bus.c
> >@@ -1905,6 +1905,26 @@ static const VMStateInfo vmstate_info_scsi_requests = {
> > .put = put_scsi_requests,
> > };
> >
> >+static bool scsi_sense_state_needed(void *opaque)
> >+{
> >+ SCSIDevice *s = opaque;
> >+
> >+ return s->sense_len > SCSI_SENSE_BUF_SIZE_OLD;
> >+}
> >+
> >+static const VMStateDescription vmstate_scsi_sense_state = {
> >+ .name = "SCSIDevice/sense",
> >+ .version_id = 1,
> >+ .minimum_version_id = 1,
> >+ .minimum_version_id_old = 1,
> >+ .fields = (VMStateField []) {
> >+ VMSTATE_UINT8_SUB_ARRAY(sense, SCSIDevice,
> >+ SCSI_SENSE_BUF_SIZE_OLD,
> >+ SCSI_SENSE_BUF_SIZE - SCSI_SENSE_BUF_SIZE_OLD),
> >+ VMSTATE_END_OF_LIST()
> >+ }
> >+};
> >+
> > const VMStateDescription vmstate_scsi_device = {
> > .name = "SCSIDevice",
> > .version_id = 1,
> >@@ -1915,7 +1935,7 @@ const VMStateDescription vmstate_scsi_device = {
> > VMSTATE_UINT8(unit_attention.asc, SCSIDevice),
> > VMSTATE_UINT8(unit_attention.ascq, SCSIDevice),
> > VMSTATE_BOOL(sense_is_ua, SCSIDevice),
> >- VMSTATE_UINT8_ARRAY(sense, SCSIDevice, SCSI_SENSE_BUF_SIZE),
> >+ VMSTATE_UINT8_SUB_ARRAY(sense, SCSIDevice, 0, SCSI_SENSE_BUF_SIZE_OLD),
> > VMSTATE_UINT32(sense_len, SCSIDevice),
> > {
> > .name = "requests",
> >@@ -1927,6 +1947,14 @@ const VMStateDescription vmstate_scsi_device = {
> > .offset = 0,
> > },
> > VMSTATE_END_OF_LIST()
> >+ },
> >+ .subsections = (VMStateSubsection []) {
> >+ {
> >+ .vmsd = &vmstate_scsi_sense_state,
> >+ .needed = scsi_sense_state_needed,
> >+ }, {
> >+ /* empty */
> >+ }
> > }
> > };
> >
> >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)
> >
> >
>
> Looks good, thanks! I'll apply to scsi-next after a little more testing.
>
Ping. Should we take this in 2.0?
Thanks,
Fam
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] scsi: Fix migration of scsi sense data
2014-03-14 5:58 ` Fam Zheng
@ 2014-03-14 12:38 ` Paolo Bonzini
0 siblings, 0 replies; 4+ messages in thread
From: Paolo Bonzini @ 2014-03-14 12:38 UTC (permalink / raw)
To: Fam Zheng; +Cc: Gerd Hoffmann, qemu-devel, Andreas Färber, Juan Quintela
Il 14/03/2014 06:58, Fam Zheng ha scritto:
> Ping. Should we take this in 2.0?
Of course, I'll send it for 2.0-rc1.
Paolo
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-03-14 12:39 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-06 8:26 [Qemu-devel] [PATCH] scsi: Fix migration of scsi sense data Fam Zheng
2014-03-06 8:42 ` Paolo Bonzini
2014-03-14 5:58 ` Fam Zheng
2014-03-14 12:38 ` Paolo Bonzini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).