All of lore.kernel.org
 help / color / mirror / Atom feed
From: Wen Congyang <wency@cn.fujitsu.com>
To: xen devel <xen-devel@lists.xen.org>,
	Andrew Cooper <andrew.cooper3@citrix.com>,
	Ian Campbell <ian.campbell@citrix.com>,
	Ian Jackson <ian.jackson@eu.citrix.com>,
	Wei Liu <wei.liu2@citrix.com>
Cc: Wen Congyang <wency@cn.fujitsu.com>,
	Gui Jianfeng <guijianfeng@cn.fujitsu.com>,
	Jiang Yunhong <yunhong.jiang@intel.com>,
	Dong Eddie <eddie.dong@intel.com>,
	Anthony Perard <anthony.perard@citrix.com>,
	Shriram Rajagopalan <rshriram@cs.ubc.ca>,
	Yang Hongyang <hongyang.yang@easystack.cn>
Subject: [PATCH v5 COLOPre 08/18] tools/libxl: introduce libxl__domain_restore_device_model to load qemu state
Date: Thu, 17 Dec 2015 15:48:12 +0800	[thread overview]
Message-ID: <1450338502-27335-9-git-send-email-wency@cn.fujitsu.com> (raw)
In-Reply-To: <1450338502-27335-1-git-send-email-wency@cn.fujitsu.com>

From: Yang Hongyang <hongyang.yang@easystack.cn>

In normal migration, the qemu state was passed to qemu as a parameter.
With COLO, Secondary vm is running. So we will do the following steps
at every checkpoint:
1. suspend both primary vm and secondary vm
2. sync the state
3. resume both primary vm and secondary vm
Primary will send qemu's state in step2, and
Secondary's qemu should read it and restore the state before it
is resumed. We can not pass the state to qemu as a parameter because
Secondary QEMU already started at this point, so we introduce
libxl__domain_restore_device_model() to do it.
This API should be called before resuming secondary vm.

Signed-off-by: Yang Hongyang <hongyang.yang@easystack.cn>
Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
Cc: Anthony Perard <anthony.perard@citrix.com>
---
 tools/libxl/libxl_dom_save.c | 20 ++++++++++++++++++++
 tools/libxl/libxl_internal.h |  4 ++++
 tools/libxl/libxl_qmp.c      | 10 ++++++++++
 3 files changed, 34 insertions(+)

diff --git a/tools/libxl/libxl_dom_save.c b/tools/libxl/libxl_dom_save.c
index 0bfa5fc..88cb1b3 100644
--- a/tools/libxl/libxl_dom_save.c
+++ b/tools/libxl/libxl_dom_save.c
@@ -609,6 +609,26 @@ int libxl__restore_emulator_xenstore_data(libxl__domain_create_state *dcs,
     return rc;
 }
 
+int libxl__domain_restore_device_model(libxl__gc *gc, uint32_t domid,
+                                       const char *restore_file)
+{
+    int rc;
+
+    switch (libxl__device_model_version_running(gc, domid)) {
+    case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL:
+        /* not supported now */
+        rc = ERROR_INVAL;
+        break;
+    case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN:
+        rc = libxl__qmp_restore(gc, domid, restore_file);
+        break;
+    default:
+        rc = ERROR_INVAL;
+    }
+
+    return rc;
+}
+
 /*
  * Local variables:
  * mode: C
diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index 9470d96..27a4590 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -1115,6 +1115,8 @@ _hidden int libxl__domain_rename(libxl__gc *gc, uint32_t domid,
                                  const char *old_name, const char *new_name,
                                  xs_transaction_t trans);
 
+_hidden int libxl__domain_restore_device_model(libxl__gc *gc, uint32_t domid,
+                                               const char *restore_file);
 _hidden int libxl__domain_resume_device_model(libxl__gc *gc, uint32_t domid);
 
 _hidden const char *libxl__userdata_path(libxl__gc *gc, uint32_t domid,
@@ -1758,6 +1760,8 @@ _hidden int libxl__qmp_stop(libxl__gc *gc, int domid);
 _hidden int libxl__qmp_resume(libxl__gc *gc, int domid);
 /* Save current QEMU state into fd. */
 _hidden int libxl__qmp_save(libxl__gc *gc, int domid, const char *filename);
+/* Load current QEMU state from fd. */
+_hidden int libxl__qmp_restore(libxl__gc *gc, int domid, const char *filename);
 /* Set dirty bitmap logging status */
 _hidden int libxl__qmp_set_global_dirty_log(libxl__gc *gc, int domid, bool enable);
 _hidden int libxl__qmp_insert_cdrom(libxl__gc *gc, int domid, const libxl_device_disk *disk);
diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c
index 714038b..eec8a44 100644
--- a/tools/libxl/libxl_qmp.c
+++ b/tools/libxl/libxl_qmp.c
@@ -905,6 +905,16 @@ int libxl__qmp_save(libxl__gc *gc, int domid, const char *filename)
                            NULL, NULL);
 }
 
+int libxl__qmp_restore(libxl__gc *gc, int domid, const char *state_file)
+{
+    libxl__json_object *args = NULL;
+
+    qmp_parameters_add_string(gc, &args, "filename", state_file);
+
+    return qmp_run_command(gc, domid, "xen-load-devices-state", args,
+                           NULL, NULL);
+}
+
 static int qmp_change(libxl__gc *gc, libxl__qmp_handler *qmp,
                       char *device, char *target, char *arg)
 {
-- 
2.5.0

  parent reply	other threads:[~2015-12-17  7:48 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-17  7:48 [PATCH v5 COLOPre 00/18] Prerequisite patches for COLO Wen Congyang
2015-12-17  7:48 ` [PATCH v5 COLOPre 01/18] libxl/remus: init checkpoint_callback in Remus setup callback Wen Congyang
2015-12-17  7:48 ` [PATCH v5 COLOPre 02/18] tools/libxl: move remus code into libxl_remus.c Wen Congyang
2015-12-17  7:48 ` [PATCH v5 COLOPre 03/18] tools/libxl: move save/restore code into libxl_dom_save.c Wen Congyang
2015-12-17  7:48 ` [PATCH v5 COLOPre 04/18] libxl/save: Refactor libxl__domain_suspend_state Wen Congyang
2015-12-17  7:48 ` [PATCH v5 COLOPre 05/18] tools/libxc: support to resume uncooperative HVM guests Wen Congyang
2015-12-17  7:48 ` [PATCH v5 COLOPre 06/18] tools/libxl: introduce enum type libxl_checkpointed_stream Wen Congyang
2015-12-17  7:48 ` [PATCH v5 COLOPre 07/18] migration/save: pass checkpointed_stream from libxl to libxc Wen Congyang
2016-01-25 18:38   ` Konrad Rzeszutek Wilk
2016-01-25 19:14     ` Konrad Rzeszutek Wilk
2016-01-26  5:42       ` Wen Congyang
2015-12-17  7:48 ` Wen Congyang [this message]
2016-01-25 18:41   ` [PATCH v5 COLOPre 08/18] tools/libxl: introduce libxl__domain_restore_device_model to load qemu state Konrad Rzeszutek Wilk
2016-01-26  6:17     ` Wen Congyang
2016-01-26 15:02       ` Konrad Rzeszutek Wilk
2015-12-17  7:48 ` [PATCH v5 COLOPre 09/18] tools/libxl: introduce libxl__domain_common_switch_qemu_logdirty() Wen Congyang
2015-12-17  7:48 ` [PATCH v5 COLOPre 10/18] tools/libxl: export logdirty_init Wen Congyang
2015-12-17  7:48 ` [PATCH v5 COLOPre 11/18] tools/libxl: Add back channel to allow migration target send data back Wen Congyang
2015-12-17  7:48 ` [PATCH v5 COLOPre 12/18] tools/libx{l, c}: add back channel to libxc Wen Congyang
2015-12-17  7:48 ` [PATCH v5 COLOPre 13/18] tools/libxl: rename remus device to checkpoint device Wen Congyang
2015-12-17  7:48 ` [PATCH v5 COLOPre 14/18] tools/libxl: fix backword compatibility after the automatic renaming Wen Congyang
2016-01-25 19:43   ` Konrad Rzeszutek Wilk
2016-01-26  8:06     ` Wen Congyang
2016-01-26 15:02       ` Konrad Rzeszutek Wilk
2015-12-17  7:48 ` [PATCH v5 COLOPre 15/18] tools/libxl: adjust the indentation Wen Congyang
2015-12-17  7:48 ` [PATCH v5 COLOPre 16/18] tools/libxl: store remus_ops in checkpoint device state Wen Congyang
2015-12-17  7:48 ` [PATCH v5 COLOPre 17/18] tools/libxl: move remus state into a seperate structure Wen Congyang
2015-12-17  7:48 ` [PATCH v5 COLOPre 18/18] tools/libxl: seperate device init/cleanup from checkpoint device layer Wen Congyang
2016-01-04 17:02 ` [PATCH v5 COLOPre 00/18] Prerequisite patches for COLO Ian Jackson
2016-01-18  1:51   ` Wen Congyang

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=1450338502-27335-9-git-send-email-wency@cn.fujitsu.com \
    --to=wency@cn.fujitsu.com \
    --cc=andrew.cooper3@citrix.com \
    --cc=anthony.perard@citrix.com \
    --cc=eddie.dong@intel.com \
    --cc=guijianfeng@cn.fujitsu.com \
    --cc=hongyang.yang@easystack.cn \
    --cc=ian.campbell@citrix.com \
    --cc=ian.jackson@eu.citrix.com \
    --cc=rshriram@cs.ubc.ca \
    --cc=wei.liu2@citrix.com \
    --cc=xen-devel@lists.xen.org \
    --cc=yunhong.jiang@intel.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.