[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 20/41] qmp: hmp: add migrate "resume" option
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 20/41] qmp: hmp: add migrate "resume" option |
Date: |
Wed, 9 May 2018 13:23:45 +0200 |
From: Peter Xu <address@hidden>
It will be used when we want to resume one paused migration.
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Peter Xu <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
hmp-commands.hx | 7 ++++---
hmp.c | 4 +++-
migration/migration.c | 2 +-
qapi/migration.json | 5 ++++-
4 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/hmp-commands.hx b/hmp-commands.hx
index 35d862a5d2..078ded20cd 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -897,13 +897,14 @@ ETEXI
{
.name = "migrate",
- .args_type = "detach:-d,blk:-b,inc:-i,uri:s",
- .params = "[-d] [-b] [-i] uri",
+ .args_type = "detach:-d,blk:-b,inc:-i,resume:-r,uri:s",
+ .params = "[-d] [-b] [-i] [-r] uri",
.help = "migrate to URI (using -d to not wait for completion)"
"\n\t\t\t -b for migration without shared storage with"
" full copy of disk\n\t\t\t -i for migration without "
"shared storage with incremental copy of disk "
- "(base image shared between src and destination)",
+ "(base image shared between src and destination)"
+ "\n\t\t\t -r to resume a paused migration",
.cmd = hmp_migrate,
},
diff --git a/hmp.c b/hmp.c
index 898e25f3e1..59d5341590 100644
--- a/hmp.c
+++ b/hmp.c
@@ -1919,10 +1919,12 @@ void hmp_migrate(Monitor *mon, const QDict *qdict)
bool detach = qdict_get_try_bool(qdict, "detach", false);
bool blk = qdict_get_try_bool(qdict, "blk", false);
bool inc = qdict_get_try_bool(qdict, "inc", false);
+ bool resume = qdict_get_try_bool(qdict, "resume", false);
const char *uri = qdict_get_str(qdict, "uri");
Error *err = NULL;
- qmp_migrate(uri, !!blk, blk, !!inc, inc, false, false, &err);
+ qmp_migrate(uri, !!blk, blk, !!inc, inc,
+ false, false, true, resume, &err);
if (err) {
hmp_handle_error(mon, &err);
return;
diff --git a/migration/migration.c b/migration/migration.c
index 3d3b0a5b4a..19f07fb64f 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1413,7 +1413,7 @@ bool migration_is_blocked(Error **errp)
void qmp_migrate(const char *uri, bool has_blk, bool blk,
bool has_inc, bool inc, bool has_detach, bool detach,
- Error **errp)
+ bool has_resume, bool resume, Error **errp)
{
Error *local_err = NULL;
MigrationState *s = migrate_get_current();
diff --git a/qapi/migration.json b/qapi/migration.json
index 244334e9f4..84ae4b90d5 100644
--- a/qapi/migration.json
+++ b/qapi/migration.json
@@ -1031,6 +1031,8 @@
# @detach: this argument exists only for compatibility reasons and
# is ignored by QEMU
#
+# @resume: resume one paused migration, default "off". (since 2.12)
+#
# Returns: nothing on success
#
# Since: 0.14.0
@@ -1052,7 +1054,8 @@
#
##
{ 'command': 'migrate',
- 'data': {'uri': 'str', '*blk': 'bool', '*inc': 'bool', '*detach': 'bool' } }
+ 'data': {'uri': 'str', '*blk': 'bool', '*inc': 'bool',
+ '*detach': 'bool', '*resume': 'bool' } }
##
# @migrate-incoming:
--
2.17.0
- [Qemu-devel] [PULL 10/41] migration: Create multifd channels, (continued)
- [Qemu-devel] [PULL 10/41] migration: Create multifd channels, Juan Quintela, 2018/05/09
- [Qemu-devel] [PULL 11/41] migration: Delay start of migration main routines, Juan Quintela, 2018/05/09
- [Qemu-devel] [PULL 12/41] migration: Transmit initial package through the multifd channels, Juan Quintela, 2018/05/09
- [Qemu-devel] [PULL 13/41] migration: Define MultifdRecvParams sooner, Juan Quintela, 2018/05/09
- [Qemu-devel] [PULL 15/41] migration: new postcopy-pause state, Juan Quintela, 2018/05/09
- [Qemu-devel] [PULL 16/41] migration: implement "postcopy-pause" src logic, Juan Quintela, 2018/05/09
- [Qemu-devel] [PULL 17/41] migration: allow dst vm pause on postcopy, Juan Quintela, 2018/05/09
- [Qemu-devel] [PULL 18/41] migration: allow src return path to pause, Juan Quintela, 2018/05/09
- [Qemu-devel] [PULL 14/41] migration: let incoming side use thread context, Juan Quintela, 2018/05/09
- [Qemu-devel] [PULL 19/41] migration: allow fault thread to pause, Juan Quintela, 2018/05/09
- [Qemu-devel] [PULL 20/41] qmp: hmp: add migrate "resume" option,
Juan Quintela <=
- [Qemu-devel] [PULL 23/41] migration: wakeup dst ram-load-thread for recover, Juan Quintela, 2018/05/09
- [Qemu-devel] [PULL 21/41] migration: rebuild channel on source, Juan Quintela, 2018/05/09
- [Qemu-devel] [PULL 24/41] migration: new cmd MIG_CMD_RECV_BITMAP, Juan Quintela, 2018/05/09
- [Qemu-devel] [PULL 22/41] migration: new state "postcopy-recover", Juan Quintela, 2018/05/09
- [Qemu-devel] [PULL 26/41] migration: new cmd MIG_CMD_POSTCOPY_RESUME, Juan Quintela, 2018/05/09
- [Qemu-devel] [PULL 25/41] migration: new message MIG_RP_MSG_RECV_BITMAP, Juan Quintela, 2018/05/09
- [Qemu-devel] [PULL 28/41] migration: introduce SaveVMHandlers.resume_prepare, Juan Quintela, 2018/05/09
- [Qemu-devel] [PULL 29/41] migration: synchronize dirty bitmap for resume, Juan Quintela, 2018/05/09