qapi: Convert migrate_set_downtime

Signed-off-by: Luiz Capitulino <[email protected]>

diff --git a/hmp-commands.hx b/hmp-commands.hx
index e48c2ca531670716c66e54db9d2249c57aad174c..6ba694d45a968b35b93f3a2bc8cbfa30e0220673 100644 (file)
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -801,8 +801,7 @@ ETEXI
         .args_type  = "value:T",
         .params     = "value",
         .help       = "set maximum tolerated downtime (in seconds) for migrations",
-        .user_print = monitor_user_noop,
-        .mhandler.cmd_new = do_migrate_set_downtime,
+        .mhandler.cmd = hmp_migrate_set_downtime,
     },
 
 STEXI

diff --git a/hmp.c b/hmp.c
index 92bb08fe6facf335b1be7e7a18be64c8fdc3ceb9..04e6b73810e4d8f8fcc050b27dbedae8be5c35b3 100644 (file)
--- a/hmp.c
+++ b/hmp.c
@@ -667,3 +667,9 @@ void hmp_migrate_cancel(Monitor *mon, const QDict *qdict)
 {
     qmp_migrate_cancel(NULL);
 }
+
+void hmp_migrate_set_downtime(Monitor *mon, const QDict *qdict)
+{
+    double value = qdict_get_double(qdict, "value");
+    qmp_migrate_set_downtime(value, NULL);
+}

diff --git a/hmp.h b/hmp.h
index 2b0c1e4ab7151265a0c998d47bd7e033af33cbdc..9182622cc08c6323d4b91a5b802c21a2c2797adf 100644 (file)
--- a/hmp.h
+++ b/hmp.h
@@ -47,5 +47,6 @@ void hmp_balloon(Monitor *mon, const QDict *qdict);
 void hmp_block_resize(Monitor *mon, const QDict *qdict);
 void hmp_snapshot_blkdev(Monitor *mon, const QDict *qdict);
 void hmp_migrate_cancel(Monitor *mon, const QDict *qdict);
+void hmp_migrate_set_downtime(Monitor *mon, const QDict *qdict);
 
 #endif

diff --git a/migration.c b/migration.c
index fa603d68e92fda8200c516efe0d36ce071abda9b..a5631622f0b307c3d78654c7c583ca192d543b32 100644 (file)
--- a/migration.c
+++ b/migration.c
@@ -490,14 +490,9 @@ int do_migrate_set_speed(Monitor *mon, const QDict *qdict, QObject **ret_data)
     return 0;
 }
 
-int do_migrate_set_downtime(Monitor *mon, const QDict *qdict,
-                            QObject **ret_data)
+void qmp_migrate_set_downtime(double value, Error **errp)
 {
-    double d;
-
-    d = qdict_get_double(qdict, "value") * 1e9;
-    d = MAX(0, MIN(UINT64_MAX, d));
-    max_downtime = (uint64_t)d;
-
-    return 0;
+    value *= 1e9;
+    value = MAX(0, MIN(UINT64_MAX, value));
+    max_downtime = (uint64_t)value;
 }

diff --git a/migration.h b/migration.h
index ff2e40b4cbbae5d6f6ab3fcba45593443bddf5ae..539f8f184029b4899d154e8e8c24888c80f4d579 100644 (file)
--- a/migration.h
+++ b/migration.h
@@ -46,9 +46,6 @@ int do_migrate_set_speed(Monitor *mon, const QDict *qdict, QObject **ret_data);
 
 uint64_t migrate_max_downtime(void);
 
-int do_migrate_set_downtime(Monitor *mon, const QDict *qdict,
-                            QObject **ret_data);
-
 void do_info_migrate_print(Monitor *mon, const QObject *data);
 
 void do_info_migrate(Monitor *mon, QObject **ret_data);

diff --git a/qapi-schema.json b/qapi-schema.json
index d638f125d93c597d293696a27a7fce75431e285b..d9b9fa10d97a179417cb4e1a9ddb4810db604ce8 100644 (file)
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -1140,3 +1140,16 @@
 # Since: 0.14.0
 ##
 { 'command': 'migrate_cancel' }
+
+##
+# @migrate_set_downtime
+#
+# Set maximum tolerated downtime for migration.
+#
+# @value: maximum downtime in seconds
+#
+# Returns: nothing on success
+#
+# Since: 0.14.0
+##
+{ 'command': 'migrate_set_downtime', 'data': {'value': 'number'} }

diff --git a/qmp-commands.hx b/qmp-commands.hx
index 5eb4b76dfc99fda1a7208c584d10b9f5cc1e6fe6..b4cadebe96ca717228753ffc162b2924d34bcfbd 100644 (file)
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -518,10 +518,7 @@ EQMP
     {
         .name       = "migrate_set_downtime",
         .args_type  = "value:T",
-        .params     = "value",
-        .help       = "set maximum tolerated downtime (in seconds) for migrations",
-        .user_print = monitor_user_noop,
-        .mhandler.cmd_new = do_migrate_set_downtime,
+        .mhandler.cmd_new = qmp_marshal_input_migrate_set_downtime,
     },
 
 SQMP