[2/2] libxl/libxl_qmp.c: Update COLO query replication status API

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 <[e-mail]>
---
 tools/libxl/libxl_colo_restore.c | 2 +-
 tools/libxl/libxl_colo_save.c    | 3 ++-
 tools/libxl/libxl_internal.h     | 2 +-
 tools/libxl/libxl_qmp.c          | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

Comments

Wei Liu March 17, 2017, 10:51 a.m. UTC | #1

On Fri, Mar 17, 2017 at 04:42:32PM +0800, Zhang Chen wrote:
> Because of qemu side patch changed the API that comment by community,
> So we fix it in Xen side.

Maybe:

The QEMU community has asked us to change QMP command
xen-get-replication-error to query-xen-replication-status. Modify Xen
side to use the new name.

Patch

diff --git a/tools/libxl/libxl_colo_restore.c b/tools/libxl/libxl_colo_restore.c
index 7178ae9..0c535bd 100644
--- a/tools/libxl/libxl_colo_restore.c
+++ b/tools/libxl/libxl_colo_restore.c
@@ -986,7 +986,7 @@  static void colo_suspend_vm_done(libxl__egc *egc,
 
     crcs->status = LIBXL_COLO_SUSPENDED;
 
-    if (libxl__qmp_get_replication_error(gc, crs->domid)) {
+    if (libxl__qmp_query_xen_replication_status(gc, crs->domid)) {
         LOGD(ERROR, crs->domid, "replication error occurs when secondary vm is running");
         goto out;
     }
diff --git a/tools/libxl/libxl_colo_save.c b/tools/libxl/libxl_colo_save.c
index eabc04c..f687d5a 100644
--- a/tools/libxl/libxl_colo_save.c
+++ b/tools/libxl/libxl_colo_save.c
@@ -345,7 +345,8 @@  static void colo_read_svm_suspended_done(libxl__egc *egc,
         goto out;
     }
 
-    if (!css->paused && libxl__qmp_get_replication_error(gc, dss->domid)) {
+    if (!css->paused &&
+        libxl__qmp_query_xen_replication_status(gc, dss->domid)) {
         LOGD(ERROR, dss->domid,
              "replication error occurs when primary vm is running");
         goto out;
diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h
index 9fc05e7..25cb08a 100644
--- a/tools/libxl/libxl_internal.h
+++ b/tools/libxl/libxl_internal.h
@@ -1829,7 +1829,7 @@  _hidden int libxl__qmp_nbd_server_add(libxl__gc *gc, int domid,
 _hidden int libxl__qmp_start_replication(libxl__gc *gc, int domid,
                                          bool primary);
 /* Get replication error that occurs when the vm is running */
-_hidden int libxl__qmp_get_replication_error(libxl__gc *gc, int domid);
+_hidden int libxl__qmp_query_xen_replication_status(libxl__gc *gc, int domid);
 /* Do checkpoint */
 _hidden int libxl__qmp_colo_do_checkpoint(libxl__gc *gc, int domid);
 /* Stop replication */
diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c
index eef7722..eab993a 100644
--- a/tools/libxl/libxl_qmp.c
+++ b/tools/libxl/libxl_qmp.c
@@ -1079,9 +1079,9 @@  int libxl__qmp_start_replication(libxl__gc *gc, int domid, bool primary)
     return qmp_run_command(gc, domid, "xen-set-replication", args, NULL, NULL);
 }
 
-int libxl__qmp_get_replication_error(libxl__gc *gc, int domid)
+int libxl__qmp_query_xen_replication_status(libxl__gc *gc, int domid)
 {
-    return qmp_run_command(gc, domid, "xen-get-replication-error", NULL,
+    return qmp_run_command(gc, domid, "query-xen-replication-status", NULL,
                            NULL, NULL);
 }