From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41510) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWMot-0008KV-S2 for qemu-devel@nongnu.org; Thu, 18 Feb 2016 06:32:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aWMoq-0005Sr-JA for qemu-devel@nongnu.org; Thu, 18 Feb 2016 06:32:27 -0500 Received: from e06smtp11.uk.ibm.com ([195.75.94.107]:49592) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aWMoq-0005Sc-8v for qemu-devel@nongnu.org; Thu, 18 Feb 2016 06:32:24 -0500 Received: from localhost by e06smtp11.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 18 Feb 2016 11:32:22 -0000 From: Greg Kurz Date: Thu, 18 Feb 2016 12:32:18 +0100 Message-ID: <20160218113218.9760.89211.stgit@bahia.huguette.org> In-Reply-To: <20160218113211.9760.85475.stgit@bahia.huguette.org> References: <20160218113211.9760.85475.stgit@bahia.huguette.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH v3 1/2] spapr: skip configuration section during migration of older machines List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela Cc: Laurent Vivier , qemu-devel@nongnu.org, "Dr. David Alan Gilbert" , qemu-ppc@nongnu.org, Amit Shah , David Gibson 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 --- hw/ppc/spapr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 5bd8fd3ef842..bca7cb8a5d27 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2446,6 +2446,7 @@ static void spapr_machine_2_3_instance_options(MachineState *machine) spapr_machine_2_4_instance_options(machine); savevm_skip_section_footers(); global_state_set_optional(); + savevm_skip_configuration(); } static void spapr_machine_2_3_class_options(MachineClass *mc)