From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52362) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ai3eR-0002y9-ET for qemu-devel@nongnu.org; Mon, 21 Mar 2016 13:30:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ai3eO-0001LS-32 for qemu-devel@nongnu.org; Mon, 21 Mar 2016 13:29:59 -0400 Received: from e19.ny.us.ibm.com ([129.33.205.209]:37969) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ai3eN-0001LC-UH for qemu-devel@nongnu.org; Mon, 21 Mar 2016 13:29:56 -0400 Received: from localhost by e19.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 21 Mar 2016 13:29:55 -0400 From: Michael Roth Date: Mon, 21 Mar 2016 12:28:26 -0500 Message-Id: <1458581313-19045-29-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1458581313-19045-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1458581313-19045-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 28/35] spapr: skip configuration section during migration of older machines List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Michael Roth , David Gibson , qemu-stable@nongnu.org, Greg Kurz From: Greg Kurz Since QEMU 2.4, we have a configuration section in the migration stream. This must be skipped for older machines, like it is already done for x86. This patch fixes the migration of pseries-2.3 from/to QEMU 2.3, but it breaks migration of the same machine from/to QEMU 2.4/2.4.1/2.5. We do that anyway because QEMU 2.3 is likely to be more widely deployed than newer QEMU versions. Fixes: 61964c23e5ddd5a33f15699e45ce126f879e3e33 Signed-off-by: Greg Kurz Reviewed-by: Laurent Vivier Reviewed-by: Juan Quintela Signed-off-by: David Gibson (cherry picked from commit 09b5e30da5b19f44768a5429f603caaede216757) Conflicts: hw/ppc/spapr.c *remove dep on 5013c5474 Signed-off-by: Michael Roth --- hw/ppc/spapr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 6bfb908..ff1537a 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2327,6 +2327,7 @@ static void spapr_compat_2_3(Object *obj) { savevm_skip_section_footers(); global_state_set_optional(); + savevm_skip_configuration(); } static void spapr_compat_2_2(Object *obj) -- 1.9.1