From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46157) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZK7Db-0000Uo-4I for qemu-devel@nongnu.org; Tue, 28 Jul 2015 11:55:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZK7DU-0008CB-FY for qemu-devel@nongnu.org; Tue, 28 Jul 2015 11:55:02 -0400 Received: from smtp.citrix.com ([66.165.176.89]:48046) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZK7DU-00089S-Ag for qemu-devel@nongnu.org; Tue, 28 Jul 2015 11:54:56 -0400 From: Anthony PERARD Date: Tue, 28 Jul 2015 16:54:43 +0100 Message-ID: <1438098885-4339-2-git-send-email-anthony.perard@citrix.com> In-Reply-To: <1438098885-4339-1-git-send-email-anthony.perard@citrix.com> References: <1438098885-4339-1-git-send-email-anthony.perard@citrix.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH RFC 1/3] migration: Fix regretion for xenfv machine. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU-devel Cc: Juan Quintela , Xen Devel , Anthony PERARD , Stefano Stabellini , Anthony PERARD , Amit Shah 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 --- Tested migration from QEMU 2.2.1 to master. --- 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 -- Anthony PERARD