From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35622) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZMIU7-0004pb-Bm for qemu-devel@nongnu.org; Mon, 03 Aug 2015 12:21:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZMIU2-0006rs-IX for qemu-devel@nongnu.org; Mon, 03 Aug 2015 12:21:07 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:23119) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZMIU2-0006qg-EV for qemu-devel@nongnu.org; Mon, 03 Aug 2015 12:21:02 -0400 From: Stefano Stabellini Date: Mon, 3 Aug 2015 17:19:37 +0100 Message-ID: <1438618777-29253-2-git-send-email-stefano.stabellini@eu.citrix.com> In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PULL for-2.4 2/2] migration: Fix regression for xenfv and pc, accel=xen machine. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linaro.org Cc: Anthony PERARD , xen-devel@lists.xensource.com, qemu-devel@nongnu.org, Stefano Stabellini 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 section and the section footers are not going to be present in previous version of QEMU with xenfv machine, so we skip them. The Xen toolstack libxenlight does not specify a particular version of the 'pc' machine, so migration from older version of QEMU used by Xen to newer one would break due to missing "configuration" section and section footers. Signed-off-by: Anthony PERARD Signed-off-by: Stefano Stabellini --- xen-common.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/xen-common.c b/xen-common.c index 56359ca..0dcdbc3 100644 --- a/xen-common.c +++ b/xen-common.c @@ -12,6 +12,7 @@ #include "qmp-commands.h" #include "sysemu/char.h" #include "sysemu/accel.h" +#include "migration/migration.h" //#define DEBUG_XEN @@ -119,6 +120,10 @@ static int xen_init(MachineState *ms) } qemu_add_vm_change_state_handler(xen_change_state_handler, NULL); + global_state_set_optional(); + savevm_skip_configuration(); + savevm_skip_section_footers(); + return 0; } -- 1.7.10.4