From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34050) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZMF7E-0002RC-TR for qemu-devel@nongnu.org; Mon, 03 Aug 2015 08:45:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZMF7A-0000KV-UL for qemu-devel@nongnu.org; Mon, 03 Aug 2015 08:45:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50158) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZMF7A-0000KM-Pu for qemu-devel@nongnu.org; Mon, 03 Aug 2015 08:45:12 -0400 From: Amit Shah Date: Mon, 3 Aug 2015 18:14:58 +0530 Message-Id: <8df706112e494c62dedbc351a68b45041d22be69.1438605827.git.amit.shah@redhat.com> In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [PULL for-2.4 1/3] migration: Fix regretion for xenfv machine. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu list Cc: Anthony PERARD , Peter Maydell , Amit Shah , Anthony PERARD From: Anthony PERARD This fix migration from the same QEMU version and from previous QEMU version. >>From the global state section, we don't need runstate with Xen. Right now, the way the Xen toolstack knows when QEMU is ready is when QEMU reach "running" runstate. The configuration sectin and the section footers are not going to be present in previous version of QEMU with xenfv machine, so we skip them. Signed-off-by: Anthony PERARD Message-Id: <1438098885-4339-2-git-send-email-anthony.perard@citrix.com> Signed-off-by: Amit Shah --- hw/i386/pc_piix.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index a896624..b18758d 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -455,6 +455,9 @@ static void pc_xen_hvm_init(MachineState *machine) if (bus != NULL) { pci_create_simple(bus, -1, "xen-platform"); } + global_state_set_optional(); + savevm_skip_configuration(); + savevm_skip_section_footers(); } #endif -- 2.4.3