diff mbox

[1/2] libxl/libxl_qmp.c: Update COLO do checkpoint API

Message ID 1489740152-4091-2-git-send-email-zhangchen.fnst@cn.fujitsu.com (mailing list archive)
State New, archived
Headers show

Commit Message

Zhang Chen March 17, 2017, 8:42 a.m. UTC 
Because of qemu side patch changed the API that comment by community,
So we fix it in Xen side.

Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
---
 tools/libxl/libxl_colo_restore.c | 2 +-
 tools/libxl/libxl_colo_save.c    | 2 +-
 tools/libxl/libxl_internal.h     | 2 +-
 tools/libxl/libxl_qmp.c          | 5 +++--
 4 files changed, 6 insertions(+), 5 deletions(-)

Comments

Wei Liu March 17, 2017, 10:50 a.m. UTC | #1 
On Fri, Mar 17, 2017 at 04:42:31PM +0800, Zhang Chen wrote:
> Because of qemu side patch changed the API that comment by community,
> So we fix it in Xen side.
> 
> Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>

Code-wise this patch looks OK, but I can't parse the commit message.

May I suggest you change the commit message (per my understanding) to:

The QEMU community has asked us to change the QMP command from
xen-do-checkpoint to xen-colo-do-checkpoint. Modify Xen side to use
the new name.
diff mbox

Patch

diff --git a/tools/libxl/libxl_colo_restore.c b/tools/libxl/libxl_colo_restore.c
index 065ea00..7178ae9 100644
--- a/tools/libxl/libxl_colo_restore.c
+++ b/tools/libxl/libxl_colo_restore.c
@@ -607,7 +607,7 @@  static void colo_restore_preresume_cb(libxl__egc *egc,
     }
 
     if (crs->qdisk_setuped) {
-        if (libxl__qmp_do_checkpoint(gc, crs->domid)) {
+        if (libxl__qmp_colo_do_checkpoint(gc, crs->domid)) {
             LOGD(ERROR, crs->domid, "doing checkpoint fails");
             goto out;
         }
diff --git a/tools/libxl/libxl_colo_save.c b/tools/libxl/libxl_colo_save.c
index b4ca9f6..eabc04c 100644
--- a/tools/libxl/libxl_colo_save.c
+++ b/tools/libxl/libxl_colo_save.c
@@ -460,7 +460,7 @@  static void colo_preresume_cb(libxl__egc *egc,
     }
 
     if (!css->paused) {
-        if (libxl__qmp_do_checkpoint(gc, dss->domid)) {
+        if (libxl__qmp_colo_do_checkpoint(gc, dss->domid)) {
             LOGD(ERROR, dss->domid, "doing checkpoint fails");
             goto out;
         }
diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index 7722665..9fc05e7 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -1831,7 +1831,7 @@  _hidden int libxl__qmp_start_replication(libxl__gc *gc, int domid,
 /* Get replication error that occurs when the vm is running */
 _hidden int libxl__qmp_get_replication_error(libxl__gc *gc, int domid);
 /* Do checkpoint */
-_hidden int libxl__qmp_do_checkpoint(libxl__gc *gc, int domid);
+_hidden int libxl__qmp_colo_do_checkpoint(libxl__gc *gc, int domid);
 /* Stop replication */
 _hidden int libxl__qmp_stop_replication(libxl__gc *gc, int domid,
                                         bool primary);
diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c
index a91643a..eef7722 100644
--- a/tools/libxl/libxl_qmp.c
+++ b/tools/libxl/libxl_qmp.c
@@ -1085,9 +1085,10 @@  int libxl__qmp_get_replication_error(libxl__gc *gc, int domid)
                            NULL, NULL);
 }
 
-int libxl__qmp_do_checkpoint(libxl__gc *gc, int domid)
+int libxl__qmp_colo_do_checkpoint(libxl__gc *gc, int domid)
 {
-    return qmp_run_command(gc, domid, "xen-do-checkpoint", NULL, NULL, NULL);
+    return qmp_run_command(gc, domid, "xen-colo-do-checkpoint",
+                           NULL, NULL, NULL);
 }
 
 int libxl__qmp_stop_replication(libxl__gc *gc, int domid, bool primary)