Re: [PATCH v6 2/5] migration: migrate 'inc' command option is deprecated.
Markus Armbruster wrote: > Juan Quintela writes: > >> Use blockdev-mirror with NBD instead. >> >> Reviewed-by: Thomas Huth >> Acked-by: Stefan Hajnoczi >> Reviewed-by: Markus Armbruster >> Signed-off-by: Juan Quintela >> --- >> docs/about/deprecated.rst | 9 + >> qapi/migration.json| 8 +++- >> migration/migration-hmp-cmds.c | 5 + >> migration/migration.c | 5 + >> 4 files changed, 26 insertions(+), 1 deletion(-) >> >> diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst >> index 2febd2d12f..b51136f50a 100644 >> --- a/docs/about/deprecated.rst >> +++ b/docs/about/deprecated.rst >> @@ -461,3 +461,12 @@ Migration >> ``skipped`` field in Migration stats has been deprecated. It hasn't >> been used for more than 10 years. >> >> +``inc`` migrate command option (since 8.2) >> +'' >> + >> +Use blockdev-mirror with NBD instead. >> + >> +As an intermediate step the ``inc`` functionality can be achieved by >> +setting the ``block-incremental`` migration parameter to ``true``. >> +But this parameter is also deprecated. >> + > > If you need to respin for some other reason, drop the blank line at end > of file. Same in later patches. > > [...] Done. There is a tool, git-am maybe, that complains if files don't end in a blank line. You can't have happy everybody. Later, Juan.
Re: [PATCH v6 2/5] migration: migrate 'inc' command option is deprecated.
Juan Quintela writes: > Use blockdev-mirror with NBD instead. > > Reviewed-by: Thomas Huth > Acked-by: Stefan Hajnoczi > Reviewed-by: Markus Armbruster > Signed-off-by: Juan Quintela > --- > docs/about/deprecated.rst | 9 + > qapi/migration.json| 8 +++- > migration/migration-hmp-cmds.c | 5 + > migration/migration.c | 5 + > 4 files changed, 26 insertions(+), 1 deletion(-) > > diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst > index 2febd2d12f..b51136f50a 100644 > --- a/docs/about/deprecated.rst > +++ b/docs/about/deprecated.rst > @@ -461,3 +461,12 @@ Migration > ``skipped`` field in Migration stats has been deprecated. It hasn't > been used for more than 10 years. > > +``inc`` migrate command option (since 8.2) > +'' > + > +Use blockdev-mirror with NBD instead. > + > +As an intermediate step the ``inc`` functionality can be achieved by > +setting the ``block-incremental`` migration parameter to ``true``. > +But this parameter is also deprecated. > + If you need to respin for some other reason, drop the blank line at end of file. Same in later patches. [...]
[PATCH v6 2/5] migration: migrate 'inc' command option is deprecated.
Use blockdev-mirror with NBD instead.
Reviewed-by: Thomas Huth
Acked-by: Stefan Hajnoczi
Reviewed-by: Markus Armbruster
Signed-off-by: Juan Quintela
---
docs/about/deprecated.rst | 9 +
qapi/migration.json| 8 +++-
migration/migration-hmp-cmds.c | 5 +
migration/migration.c | 5 +
4 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
index 2febd2d12f..b51136f50a 100644
--- a/docs/about/deprecated.rst
+++ b/docs/about/deprecated.rst
@@ -461,3 +461,12 @@ Migration
``skipped`` field in Migration stats has been deprecated. It hasn't
been used for more than 10 years.
+``inc`` migrate command option (since 8.2)
+''
+
+Use blockdev-mirror with NBD instead.
+
+As an intermediate step the ``inc`` functionality can be achieved by
+setting the ``block-incremental`` migration parameter to ``true``.
+But this parameter is also deprecated.
+
diff --git a/qapi/migration.json b/qapi/migration.json
index db3df12d6c..fa7f4f2575 100644
--- a/qapi/migration.json
+++ b/qapi/migration.json
@@ -1524,6 +1524,11 @@
#
# @resume: resume one paused migration, default "off". (since 3.0)
#
+# Features:
+#
+# @deprecated: Member @inc is deprecated. Use blockdev-mirror with
+# NBD instead.
+#
# Returns: nothing on success
#
# Since: 0.14
@@ -1545,7 +1550,8 @@
# <- { "return": {} }
##
{ 'command': 'migrate',
- 'data': {'uri': 'str', '*blk': 'bool', '*inc': 'bool',
+ 'data': {'uri': 'str', '*blk': 'bool',
+ '*inc': { 'type': 'bool', 'features': [ 'deprecated' ] },
'*detach': 'bool', '*resume': 'bool' } }
##
diff --git a/migration/migration-hmp-cmds.c b/migration/migration-hmp-cmds.c
index a82597f18e..83176f5bae 100644
--- a/migration/migration-hmp-cmds.c
+++ b/migration/migration-hmp-cmds.c
@@ -745,6 +745,11 @@ void hmp_migrate(Monitor *mon, const QDict *qdict)
const char *uri = qdict_get_str(qdict, "uri");
Error *err = NULL;
+if (inc) {
+warn_report("option '-i' is deprecated;"
+" use blockdev-mirror with NBD instead");
+}
+
qmp_migrate(uri, !!blk, blk, !!inc, inc,
false, false, true, resume, );
if (hmp_handle_error(mon, err)) {
diff --git a/migration/migration.c b/migration/migration.c
index 6ba5e145ac..e54baf9102 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1603,6 +1603,11 @@ static bool migrate_prepare(MigrationState *s, bool blk,
bool blk_inc,
{
Error *local_err = NULL;
+if (blk_inc) {
+warn_report("parameter 'inc' is deprecated;"
+" use blockdev-mirror with NBD instead");
+}
+
if (resume) {
if (s->state != MIGRATION_STATUS_POSTCOPY_PAUSED) {
error_setg(errp, "Cannot resume if there is no "
--
2.41.0
