Re: [Qemu-devel] [PATCH 8/9] migration: add dirty parameter
CC'ing Eric Blake for monitor interface review. On 12/11/2014 09:17 AM, Vladimir Sementsov-Ogievskiy wrote: Add dirty parameter to qmp-migrate command. If this parameter is true, block-migration.c will migrate dirty bitmaps. This parameter can be used without blk parameter to migrate only dirty bitmaps, skipping block migration. Signed-off-by: Vladimir Sementsov-Ogievskiy vsement...@parallels.com --- hmp-commands.hx | 10 ++ hmp.c | 4 +++- include/migration/migration.h | 1 + migration.c | 4 +++- qapi-schema.json | 2 +- qmp-commands.hx | 5 - savevm.c | 3 ++- 7 files changed, 20 insertions(+), 9 deletions(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index e37bc8b..d421695 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -887,23 +887,25 @@ ETEXI { .name = migrate, -.args_type = detach:-d,blk:-b,inc:-i,uri:s, +.args_type = detach:-d,blk:-b,inc:-i,dirty:-D,uri:s, .params = [-d] [-b] [-i] uri, ^ Missing the new -D parameter? .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), + shared storage with incremental copy of disk\n\t\t\t + -D for migration of named dirty bitmaps as well\n\t\t\t + (base image shared between src and destination), .mhandler.cmd = hmp_migrate, }, STEXI -@item migrate [-d] [-b] [-i] @var{uri} +@item migrate [-d] [-b] [-i] [-D] @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) + -D for migration of named dirty bitmaps ETEXI { diff --git a/hmp.c b/hmp.c index 17a2a2b..771f666 100644 --- a/hmp.c +++ b/hmp.c @@ -1340,10 +1340,12 @@ void hmp_migrate(Monitor *mon, const QDict *qdict) int detach = qdict_get_try_bool(qdict, detach, 0); int blk = qdict_get_try_bool(qdict, blk, 0); int inc = qdict_get_try_bool(qdict, inc, 0); +int dirty = qdict_get_try_bool(qdict, dirty, 0); 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, !!dirty, dirty, +false, false, err); if (err) { monitor_printf(mon, migrate: %s\n, error_get_pretty(err)); error_free(err); diff --git a/include/migration/migration.h b/include/migration/migration.h index 3cb5ba8..48d71d3 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -37,6 +37,7 @@ struct MigrationParams { bool blk; bool shared; +bool dirty; }; typedef struct MigrationState MigrationState; diff --git a/migration.c b/migration.c index c49a05a..e7bb7f3 100644 --- a/migration.c +++ b/migration.c @@ -404,7 +404,8 @@ void migrate_del_blocker(Error *reason) } void qmp_migrate(const char *uri, bool has_blk, bool blk, - bool has_inc, bool inc, bool has_detach, bool detach, + bool has_inc, bool inc, bool has_dirty, bool dirty, + bool has_detach, bool detach, Error **errp) { Error *local_err = NULL; @@ -414,6 +415,7 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk, params.blk = has_blk blk; params.shared = has_inc inc; +params.dirty = has_dirty dirty; if (s-state == MIG_STATE_ACTIVE || s-state == MIG_STATE_SETUP || s-state == MIG_STATE_CANCELLING) { diff --git a/qapi-schema.json b/qapi-schema.json index 793031b..203f4f0 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1660,7 +1660,7 @@ # Since: 0.14.0 ## You'll want to document the new parameter just above here, and add in the since 2.3 blurb. { 'command': 'migrate', - 'data': {'uri': 'str', '*blk': 'bool', '*inc': 'bool', '*detach': 'bool' } } + 'data': {'uri': 'str', '*blk': 'bool', '*inc': 'bool', '*dirty': 'bool', '*detach': 'bool' } } # @xen-save-devices-state: # diff --git a/qmp-commands.hx b/qmp-commands.hx index 1eba583..e41d033 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -610,7 +610,7 @@ EQMP { .name = migrate, -.args_type = detach:-d,blk:-b,inc:-i,uri:s, +.args_type = detach:-d,blk:-b,inc:-i,dirty:-D,uri:s, .mhandler.cmd_new = qmp_marshal_input_migrate, }, @@ -624,6 +624,7 @@ Arguments: - blk: block migration, full disk copy (json-bool, optional) - inc: incremental disk copy
Re: [Qemu-devel] [PATCH 8/9] migration: add dirty parameter
On 01/08/2015 02:51 PM, John Snow wrote: CC'ing Eric Blake for monitor interface review. Indeed, I already saw and reviewed the monitor interface in a mail dated Dec 11. On 12/11/2014 09:17 AM, Vladimir Sementsov-Ogievskiy wrote: Add dirty parameter to qmp-migrate command. If this parameter is true, block-migration.c will migrate dirty bitmaps. This parameter can be used without blk parameter to migrate only dirty bitmaps, skipping block migration. Signed-off-by: Vladimir Sementsov-Ogievskiy vsement...@parallels.com +.args_type = detach:-d,blk:-b,inc:-i,dirty:-D,uri:s, .params = [-d] [-b] [-i] uri, ^ Missing the new -D parameter? But I missed this point :) (I've been known to pay less attention to HMP than I do to QMP) -- Eric Blake eblake redhat com+1-919-301-3266 Libvirt virtualization library http://libvirt.org signature.asc Description: OpenPGP digital signature
Re: [Qemu-devel] [PATCH 8/9] migration: add dirty parameter
On 01/08/2015 05:29 PM, Eric Blake wrote: On 01/08/2015 02:51 PM, John Snow wrote: CC'ing Eric Blake for monitor interface review. Indeed, I already saw and reviewed the monitor interface in a mail dated Dec 11. Sorry, I missed that one. Thank you, though :) On 12/11/2014 09:17 AM, Vladimir Sementsov-Ogievskiy wrote: Add dirty parameter to qmp-migrate command. If this parameter is true, block-migration.c will migrate dirty bitmaps. This parameter can be used without blk parameter to migrate only dirty bitmaps, skipping block migration. Signed-off-by: Vladimir Sementsov-Ogievskiy vsement...@parallels.com +.args_type = detach:-d,blk:-b,inc:-i,dirty:-D,uri:s, .params = [-d] [-b] [-i] uri, ^ Missing the new -D parameter? But I missed this point :) (I've been known to pay less attention to HMP than I do to QMP) Sometimes robots miss things, it's fine ;) -- —js
Re: [Qemu-devel] [PATCH 8/9] migration: add dirty parameter
On 08/01/2015 22:51, John Snow wrote: CC'ing Eric Blake for monitor interface review. See also my review of patch 9. Paolo
Re: [Qemu-devel] [PATCH 8/9] migration: add dirty parameter
Thanks. It's interesting that checkpatch.pl doesn't warn about this line. Best regards, Vladimir On 11.12.2014 18:18, Eric Blake wrote: On 12/11/2014 07:17 AM, Vladimir Sementsov-Ogievskiy wrote: Add dirty parameter to qmp-migrate command. If this parameter is true, block-migration.c will migrate dirty bitmaps. This parameter can be used without blk parameter to migrate only dirty bitmaps, skipping block migration. Signed-off-by: Vladimir Sementsov-Ogievskiy vsement...@parallels.com --- +++ b/qapi-schema.json @@ -1660,7 +1660,7 @@ # Since: 0.14.0 ## { 'command': 'migrate', - 'data': {'uri': 'str', '*blk': 'bool', '*inc': 'bool', '*detach': 'bool' } } + 'data': {'uri': 'str', '*blk': 'bool', '*inc': 'bool', '*dirty': 'bool', '*detach': 'bool' } } Missing documentation of the new option (including a mention of '(since 2.3)'. Also, please keep lines shorter than 80 columns.
[Qemu-devel] [PATCH 8/9] migration: add dirty parameter
Add dirty parameter to qmp-migrate command. If this parameter is true, block-migration.c will migrate dirty bitmaps. This parameter can be used without blk parameter to migrate only dirty bitmaps, skipping block migration. Signed-off-by: Vladimir Sementsov-Ogievskiy vsement...@parallels.com --- hmp-commands.hx | 10 ++ hmp.c | 4 +++- include/migration/migration.h | 1 + migration.c | 4 +++- qapi-schema.json | 2 +- qmp-commands.hx | 5 - savevm.c | 3 ++- 7 files changed, 20 insertions(+), 9 deletions(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index e37bc8b..d421695 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -887,23 +887,25 @@ ETEXI { .name = migrate, -.args_type = detach:-d,blk:-b,inc:-i,uri:s, +.args_type = detach:-d,blk:-b,inc:-i,dirty:-D,uri:s, .params = [-d] [-b] [-i] 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), + shared storage with incremental copy of disk\n\t\t\t + -D for migration of named dirty bitmaps as well\n\t\t\t + (base image shared between src and destination), .mhandler.cmd = hmp_migrate, }, STEXI -@item migrate [-d] [-b] [-i] @var{uri} +@item migrate [-d] [-b] [-i] [-D] @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) + -D for migration of named dirty bitmaps ETEXI { diff --git a/hmp.c b/hmp.c index 17a2a2b..771f666 100644 --- a/hmp.c +++ b/hmp.c @@ -1340,10 +1340,12 @@ void hmp_migrate(Monitor *mon, const QDict *qdict) int detach = qdict_get_try_bool(qdict, detach, 0); int blk = qdict_get_try_bool(qdict, blk, 0); int inc = qdict_get_try_bool(qdict, inc, 0); +int dirty = qdict_get_try_bool(qdict, dirty, 0); 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, !!dirty, dirty, +false, false, err); if (err) { monitor_printf(mon, migrate: %s\n, error_get_pretty(err)); error_free(err); diff --git a/include/migration/migration.h b/include/migration/migration.h index 3cb5ba8..48d71d3 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -37,6 +37,7 @@ struct MigrationParams { bool blk; bool shared; +bool dirty; }; typedef struct MigrationState MigrationState; diff --git a/migration.c b/migration.c index c49a05a..e7bb7f3 100644 --- a/migration.c +++ b/migration.c @@ -404,7 +404,8 @@ void migrate_del_blocker(Error *reason) } void qmp_migrate(const char *uri, bool has_blk, bool blk, - bool has_inc, bool inc, bool has_detach, bool detach, + bool has_inc, bool inc, bool has_dirty, bool dirty, + bool has_detach, bool detach, Error **errp) { Error *local_err = NULL; @@ -414,6 +415,7 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk, params.blk = has_blk blk; params.shared = has_inc inc; +params.dirty = has_dirty dirty; if (s-state == MIG_STATE_ACTIVE || s-state == MIG_STATE_SETUP || s-state == MIG_STATE_CANCELLING) { diff --git a/qapi-schema.json b/qapi-schema.json index 793031b..203f4f0 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1660,7 +1660,7 @@ # Since: 0.14.0 ## { 'command': 'migrate', - 'data': {'uri': 'str', '*blk': 'bool', '*inc': 'bool', '*detach': 'bool' } } + 'data': {'uri': 'str', '*blk': 'bool', '*inc': 'bool', '*dirty': 'bool', '*detach': 'bool' } } # @xen-save-devices-state: # diff --git a/qmp-commands.hx b/qmp-commands.hx index 1eba583..e41d033 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -610,7 +610,7 @@ EQMP { .name = migrate, -.args_type = detach:-d,blk:-b,inc:-i,uri:s, +.args_type = detach:-d,blk:-b,inc:-i,dirty:-D,uri:s, .mhandler.cmd_new = qmp_marshal_input_migrate, }, @@ -624,6 +624,7 @@ Arguments: - blk: block migration, full disk copy (json-bool, optional) - inc: incremental disk copy (json-bool, optional) +- dirty: migrate named dirty bitmaps (json-bool, optional) - uri: Destination URI (json-string) Example: @@ -638,6 +639,8 @@ Notes: (2) All boolean arguments default to false (3) The user Monitor's detach argument is invalid in QMP and should not be
Re: [Qemu-devel] [PATCH 8/9] migration: add dirty parameter
On 12/11/2014 07:17 AM, Vladimir Sementsov-Ogievskiy wrote: Add dirty parameter to qmp-migrate command. If this parameter is true, block-migration.c will migrate dirty bitmaps. This parameter can be used without blk parameter to migrate only dirty bitmaps, skipping block migration. Signed-off-by: Vladimir Sementsov-Ogievskiy vsement...@parallels.com --- +++ b/qapi-schema.json @@ -1660,7 +1660,7 @@ # Since: 0.14.0 ## { 'command': 'migrate', - 'data': {'uri': 'str', '*blk': 'bool', '*inc': 'bool', '*detach': 'bool' } } + 'data': {'uri': 'str', '*blk': 'bool', '*inc': 'bool', '*dirty': 'bool', '*detach': 'bool' } } Missing documentation of the new option (including a mention of '(since 2.3)'. Also, please keep lines shorter than 80 columns. -- Eric Blake eblake redhat com+1-919-301-3266 Libvirt virtualization library http://libvirt.org signature.asc Description: OpenPGP digital signature