qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Anthony PERARD <anthony.perard@citrix.com>
To: QEMU-devel <qemu-devel@nongnu.org>
Cc: Amit Shah <amit.shah@redhat.com>,
	Anthony PERARD <anthony.perard@citrix.com>,
	Juan Quintela <quintela@redhat.com>,
	Stefano Stabellini <stefano.stabellini@citrix.com>,
	Xen Devel <xen-devel@lists.xen.org>
Subject: [Qemu-devel] [PATCH for-2.4 v3 3/3] migration: Fix regression for xenfv and pc, accel=xen machine.
Date: Mon, 3 Aug 2015 15:29:21 +0100	[thread overview]
Message-ID: <1438612161-15822-4-git-send-email-anthony.perard@citrix.com> (raw)
In-Reply-To: <1438612161-15822-1-git-send-email-anthony.perard@citrix.com>

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 <anthony.perard@citrix.com>
---
 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;
 }
 
-- 
Anthony PERARD

  parent reply	other threads:[~2015-08-03 14:29 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-03 14:29 [Qemu-devel] [PATCH for-2.4 v3 0/3] Migration regressions with Xen Anthony PERARD
2015-08-03 14:29 ` [Qemu-devel] [PATCH for-2.4 v3 1/3] migration: Fix global state " Anthony PERARD
2015-08-03 14:53   ` Stefano Stabellini
2015-08-03 16:06     ` Amit Shah
2015-08-03 14:29 ` [Qemu-devel] [PATCH for-2.4 v3 2/3] migration: Add configuration section to vmstate with xen Anthony PERARD
2015-08-03 14:48   ` Stefano Stabellini
2015-08-03 14:53     ` Anthony PERARD
2015-08-03 14:29 ` Anthony PERARD [this message]
2015-08-03 14:53   ` [Qemu-devel] [PATCH for-2.4 v3 3/3] migration: Fix regression for xenfv and pc, accel=xen machine Stefano Stabellini
2015-08-03 16:07 ` [Qemu-devel] [PATCH for-2.4 v3 0/3] Migration regressions with Xen Amit Shah
2015-08-03 16:10   ` [Qemu-devel] [Xen-devel] " Stefano Stabellini
2015-08-03 16:23   ` [Qemu-devel] " Anthony PERARD

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1438612161-15822-4-git-send-email-anthony.perard@citrix.com \
    --to=anthony.perard@citrix.com \
    --cc=amit.shah@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=quintela@redhat.com \
    --cc=stefano.stabellini@citrix.com \
    --cc=xen-devel@lists.xen.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).