From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36822) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YWKqW-0004kT-9D for qemu-devel@nongnu.org; Fri, 13 Mar 2015 04:21:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YWKqS-0002YS-4Z for qemu-devel@nongnu.org; Fri, 13 Mar 2015 04:21:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54900) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YWKqR-0002Y8-S3 for qemu-devel@nongnu.org; Fri, 13 Mar 2015 04:21:24 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t2D8LMme028939 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Fri, 13 Mar 2015 04:21:23 -0400 Date: Fri, 13 Mar 2015 09:21:19 +0100 From: Kevin Wolf Message-ID: <20150313082119.GA5299@noname.redhat.com> References: <1424708286-16483-1-git-send-email-jsnow@redhat.com> <1424708286-16483-15-git-send-email-jsnow@redhat.com> <20150313060111.GA31483@grmbl.mre> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150313060111.GA31483@grmbl.mre> Subject: Re: [Qemu-devel] [PATCH v4 14/17] ahci: Migrate IDEStatus List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Amit Shah Cc: mst@redhat.com, qemu-devel@nongnu.org, Juan Quintela , armbru@redhat.com, mreitz@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, John Snow Am 13.03.2015 um 07:01 hat Amit Shah geschrieben: > On (Mon) 23 Feb 2015 [11:18:03], John Snow wrote: > > Amazingly, we weren't doing this before. > > > > Make sure we migrate the IDEState structure that belongs to > > the AHCIDevice.IDEBus structure during migrations. > > > > No version numbering changes because AHCI is not officially > > migratable (and we can all see with good reason why) so we > > do not impact any official builds by altering the stream and > > leaving it at version 1. > > > > This fixes the rerror=stop/werror=stop test case where we wish > > to migrate a halted job. Previously, the error code would not > > migrate, so even if the job completed successfully, AHCI would > > report an error because it would still have the placeholder > > error code from initialization time. > > > > Reviewed-by: Paolo Bonzini > > Signed-off-by: John Snow > > --- > > hw/ide/ahci.c | 1 + > > hw/ide/internal.h | 3 +++ > > 2 files changed, 4 insertions(+) > > > > diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c > > index bc6d5ce..3f4fc77 100644 > > --- a/hw/ide/ahci.c > > +++ b/hw/ide/ahci.c > > @@ -1321,6 +1321,7 @@ static const VMStateDescription vmstate_ahci_device = { > > .version_id = 1, > > .fields = (VMStateField[]) { > > VMSTATE_IDE_BUS(port, AHCIDevice), > > + VMSTATE_IDE_DRIVE(port.ifs[0], AHCIDevice), > > This adds a new field to the struct without bumping up the version > number. > > Flagged by the static checker. AHCI is still marked unmigratable, so it doesn't matter (and actually, I just see that the commit message above explicitly states this). Kevin