On (Mon) 01 Aug 2016 [10:16:50], Paolo Bonzini wrote: > > > On 26/07/2016 11:03, Cao jin wrote: > > My previous commit 2e2aa316 removed internal flag msi_in_use, which > > exists in vmstate, use VMSTATE_UNUSED for migration compatibility. > > > > Reported-by: Amit Shah <amit.s...@redhat.com> > > Suggested-by: Amit Shah <amit.s...@redhat.com> > > Cc: Markus Armbruster <arm...@redhat.com> > > Cc: Marcel Apfelbaum <mar...@redhat.com> > > Cc: Paolo Bonzini <pbonz...@redhat.com> > > Cc: Michael S. Tsirkin <m...@redhat.com> > > Cc: Amit Shah <amit.s...@redhat.com> > > Signed-off-by: Cao jin <caoj.f...@cn.fujitsu.com> > > --- > > hw/scsi/mptsas.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/hw/scsi/mptsas.c b/hw/scsi/mptsas.c > > index c1a0649..0ed24d1 100644 > > --- a/hw/scsi/mptsas.c > > +++ b/hw/scsi/mptsas.c > > @@ -1370,7 +1370,7 @@ static const VMStateDescription vmstate_mptsas = { > > .post_load = mptsas_post_load, > > .fields = (VMStateField[]) { > > VMSTATE_PCI_DEVICE(dev, MPTSASState), > > - > > + VMSTATE_UNUSED(sizeof(bool)), /* Was msi_in_use */ > > This needs to be "1", not sizeof(bool), because vmstate_info_bool writes > a single byte. I'll fix this and queue the patch (removing Amit's > reviewed-by since it's effectively a different change).
Eeks, yes. This patch was merged in the meantime, so Cao Jin, please post a revert and a fix, thanks! Amit