From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47204) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZAHDN-0002FJ-C3 for qemu-devel@nongnu.org; Wed, 01 Jul 2015 08:34:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZAHDK-0008MI-5l for qemu-devel@nongnu.org; Wed, 01 Jul 2015 08:34:09 -0400 Received: from e06smtp13.uk.ibm.com ([195.75.94.109]:37207) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZAHDJ-0008IN-Sb for qemu-devel@nongnu.org; Wed, 01 Jul 2015 08:34:06 -0400 Received: from /spool/local by e06smtp13.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 1 Jul 2015 13:34:02 +0100 Received: from b06cxnps3074.portsmouth.uk.ibm.com (d06relay09.portsmouth.uk.ibm.com [9.149.109.194]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id 308D62190066 for ; Wed, 1 Jul 2015 13:33:39 +0100 (BST) Received: from d06av07.portsmouth.uk.ibm.com (d06av07.portsmouth.uk.ibm.com [9.149.37.248]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t61CY00Y32440564 for ; Wed, 1 Jul 2015 12:34:00 GMT Received: from d06av07.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av07.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t61CY0nu006520 for ; Wed, 1 Jul 2015 08:34:00 -0400 Date: Wed, 1 Jul 2015 14:33:57 +0200 From: Cornelia Huck Message-ID: <20150701143357.5d6c731c.cornelia.huck@de.ibm.com> In-Reply-To: <1435742217-62246-1-git-send-email-borntraeger@de.ibm.com> References: <1435742217-62246-1-git-send-email-borntraeger@de.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 1/1] s390x/migration: Introduce 2.4 machine List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Christian Borntraeger Cc: Alexander Graf , Juan Quintela , qemu-devel , "Dr. David Alan Gilbert" , Jens Freimann , "Jason J. Herne" , Boris Fiuczynski On Wed, 1 Jul 2015 11:16:57 +0200 Christian Borntraeger wrote: > The section footer changes commit f68945d42bab ("Add a protective > section footer") and commit 37fb569c0198 ("Disable section footers > on older machine types") broke migration for any non-versioned > machines. > > While one can argue that section footer should be enabled > explicitely for new versions instead of disabled for old ones, > this pinpoints to a problem of s390-ccw-machines: it needs to > be versioned to be compatible with future changes in common > code data structures such as section footers. > > Let's introduce a version scheme for s390-ccw-virtio machines. > We will use the old s390-ccw-virtio name as alias to the latest > version as all existing libvirt XML for the ccw type were expanded > by libvirt to that name. > > The only downside of this patch is, that the old alias s390-ccw > will no longer be available as machines can have only one alias, > but it should not really matter. > > Cc: Dr. David Alan Gilbert > Cc: Juan Quintela > Cc: Boris Fiuczynski > Cc: Jason J. Herne > Signed-off-by: Christian Borntraeger > --- > hw/s390x/s390-virtio-ccw.c | 22 ++++++++++++++++++---- > 1 file changed, 18 insertions(+), 4 deletions(-) Adapted the commit message and applied (with minor tweaks) to my s390-next branch at git://github.com/cohuck/qemu s390-next I'll probably send a pull request including this patch tomorrow, unless someone has further comments.