Added -p option to migrate command for postcopy mode and
introduce postcopy parameter for migration to indicate that postcopy mode is enabled.
Add -n option for postcopy migration which indicates disabling background transfer.
Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
---
hmp-commands.hx | 12 ++++++++----
migration.c | 2 ++
migration.h | 2 ++
qmp-commands.hx | 10 +++++++---
savevm.c | 2 ++
5 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/hmp-commands.hx b/hmp-commands.hx
index 14838b7..42a5f7e 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -746,24 +746,28 @@ 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,postcopy:-p,nobg:-n,uri:s",
+ .params = "[-d] [-b] [-i] [-p [-n]] 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-p for migration with postcopy mode enabled"
+ "\n\t\t\t-n for no background transfer of postcopy mode",
.user_print = monitor_user_noop,
.mhandler.cmd_new = do_migrate,
},
STEXI
-@item migrate [-d] [-b] [-i] @var{uri}
+@item migrate [-d] [-b] [-i] [-p [-n]] @var{uri}
@findex migrate
Migrate to @var{uri} (using -d to not wait for completion).
-b for migration with full copy of disk
-i for migration with incremental copy of disk (base image is shared)
+ -p for migration with postcopy mode enabled
+ -n for migration with postcopy mode enabled without background transfer
ETEXI
{
diff --git a/migration.c b/migration.c
index 2cef246..0149ab3 100644
--- a/migration.c
+++ b/migration.c
@@ -422,6 +422,8 @@ int do_migrate(Monitor *mon, const QDict *qdict, QObject **ret_data)
params.blk = qdict_get_try_bool(qdict, "blk", 0);
params.shared = qdict_get_try_bool(qdict, "inc", 0);
+ params.postcopy = qdict_get_try_bool(qdict, "postcopy", 0);
+ params.nobg = qdict_get_try_bool(qdict, "nobg", 0);
if (s->state == MIG_STATE_ACTIVE) {
monitor_printf(mon, "migration already in progress\n");
diff --git a/migration.h b/migration.h
index 29f468c..90ae362 100644
--- a/migration.h
+++ b/migration.h
@@ -22,6 +22,8 @@
struct MigrationParams {
int blk;
int shared;
+ int postcopy;
+ int nobg;
};
typedef struct MigrationState MigrationState;
diff --git a/qmp-commands.hx b/qmp-commands.hx
index 7e3f4b9..67c7df6 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -430,13 +430,15 @@ EQMP
{
.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,postcopy:-p,nobg:-n,uri:s",
+ .params = "[-d] [-b] [-i [-n]] 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-p for migration with postcopy mode enabled"
+ "\n\t\t\t-n for no background transfer of postcopy mode",
.user_print = monitor_user_noop,
.mhandler.cmd_new = do_migrate,
},
@@ -451,6 +453,8 @@ Arguments:
- "blk": block migration, full disk copy (json-bool, optional)
- "inc": incremental disk copy (json-bool, optional)
+- "postcopy": postcopy migration (json-bool, optional)
+- "nobg": postcopy without background transfer (json-bool, optional)
- "uri": Destination URI (json-string)
Example:
diff --git a/savevm.c b/savevm.c
index 2d8e09f..bafb706 100644
--- a/savevm.c
+++ b/savevm.c
@@ -1715,6 +1715,8 @@ static int qemu_savevm_state(Monitor *mon, QEMUFile *f)
MigrationParams params = {
.blk = 0,
.shared = 0,
+ .postcopy = 0,
+ .nobg = 0,
};
if (qemu_savevm_state_blocked(mon)) {
--
1.7.1.1
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
