From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44778) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUF9W-0007YE-Qy for qemu-devel@nongnu.org; Mon, 01 Aug 2016 11:29:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bUF9T-0006u7-5G for qemu-devel@nongnu.org; Mon, 01 Aug 2016 11:29:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48086) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUF9S-0006tH-Vs for qemu-devel@nongnu.org; Mon, 01 Aug 2016 11:29:11 -0400 Date: Mon, 1 Aug 2016 20:59:05 +0530 From: Amit Shah Message-ID: <20160801152905.GB24341@grmbl.mre> References: <1469523803-12194-1-git-send-email-caoj.fnst@cn.fujitsu.com> <71a5de12-993f-4e45-9201-797710cb5638@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <71a5de12-993f-4e45-9201-797710cb5638@redhat.com> Subject: Re: [Qemu-devel] [PATCH] mptsas: Fix a migration compatible issue List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: Cao jin , qemu-devel@nongnu.org, Markus Armbruster , Marcel Apfelbaum , "Michael S. Tsirkin" 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 > > Suggested-by: Amit Shah > > Cc: Markus Armbruster > > Cc: Marcel Apfelbaum > > Cc: Paolo Bonzini > > Cc: Michael S. Tsirkin > > Cc: Amit Shah > > Signed-off-by: Cao jin > > --- > > 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