Re: [PATCH v5 2/7] migration: migrate 'inc' command option is deprecated.
Juan Quintela writes:
> Markus Armbruster wrote:
>> Juan Quintela writes:
>>
>>> Use blockdev-mirror with NBD instead.
>>>
>>> Reviewed-by: Thomas Huth
>>> Acked-by: Stefan Hajnoczi
>>> Signed-off-by: Juan Quintela
>>>
>>> ---
>>>
>>> Improve documentation and style (thanks Markus)
>>> ---
>>> docs/about/deprecated.rst | 8
>>> qapi/migration.json| 8 +++-
>>> migration/migration-hmp-cmds.c | 5 +
>>> migration/migration.c | 5 +
>>> 4 files changed, 25 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
>>> index 2febd2d12f..fc6adf1dea 100644
>>> --- a/docs/about/deprecated.rst
>>> +++ b/docs/about/deprecated.rst
>>> @@ -461,3 +461,11 @@ 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..fee7079afa 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 +
>>> NBD'"
>>> +" instead.");
>>
>> Convention: an error or warning message is a single phrase, with no
>> newline or trailing punctuation. The simplest way to conform to it is
>> something like
>>
>>warn_report("option '-i' is deprecated;"
>>" use blockdev-mirror with NBD instead.");
>
> then the trailing dot is not needed, right?
No! Comical screwup on my part %-}
>>> +}
>>> +
>>> qmp_migrate(uri, !!blk, blk, !!inc, inc,
>>> false, false, true, resume, &err);
>>> if (hmp_handle_error(mon, err)) {
>>> diff --git a/migration/migration.c b/migration/migration.c
>>> index 6ba5e145ac..b8b3ba58df 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");
>>
>> Likewise.
>>
>>> +}
>>> +
>>> if (resume) {
>>> if (s->state != MIGRATION_STATUS_POSTCOPY_PAUSED) {
>>> error_setg(errp, "Cannot resume if there is no "
>>
>> Other than that
>> Reviewed-by: Markus Armbruster
>
> OK, fixing it.
Thanks!
Re: [PATCH v5 2/7] 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
>> Signed-off-by: Juan Quintela
>>
>> ---
>>
>> Improve documentation and style (thanks Markus)
>> ---
>> docs/about/deprecated.rst | 8
>> qapi/migration.json| 8 +++-
>> migration/migration-hmp-cmds.c | 5 +
>> migration/migration.c | 5 +
>> 4 files changed, 25 insertions(+), 1 deletion(-)
>>
>> diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
>> index 2febd2d12f..fc6adf1dea 100644
>> --- a/docs/about/deprecated.rst
>> +++ b/docs/about/deprecated.rst
>> @@ -461,3 +461,11 @@ 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..fee7079afa 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 +
>> NBD'"
>> +" instead.");
>
> Convention: an error or warning message is a single phrase, with no
> newline or trailing punctuation. The simplest way to conform to it is
> something like
>
>warn_report("option '-i' is deprecated;"
>" use blockdev-mirror with NBD instead.");
then the trailing dot is not needed, right?
>> +}
>> +
>> qmp_migrate(uri, !!blk, blk, !!inc, inc,
>> false, false, true, resume, &err);
>> if (hmp_handle_error(mon, err)) {
>> diff --git a/migration/migration.c b/migration/migration.c
>> index 6ba5e145ac..b8b3ba58df 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");
>
> Likewise.
>
>> +}
>> +
>> if (resume) {
>> if (s->state != MIGRATION_STATUS_POSTCOPY_PAUSED) {
>> error_setg(errp, "Cannot resume if there is no "
>
> Other than that
> Reviewed-by: Markus Armbruster
OK, fixing it.
Re: [PATCH v5 2/7] migration: migrate 'inc' command option is deprecated.
Juan Quintela writes:
> Use blockdev-mirror with NBD instead.
>
> Reviewed-by: Thomas Huth
> Acked-by: Stefan Hajnoczi
> Signed-off-by: Juan Quintela
>
> ---
>
> Improve documentation and style (thanks Markus)
> ---
> docs/about/deprecated.rst | 8
> qapi/migration.json| 8 +++-
> migration/migration-hmp-cmds.c | 5 +
> migration/migration.c | 5 +
> 4 files changed, 25 insertions(+), 1 deletion(-)
>
> diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
> index 2febd2d12f..fc6adf1dea 100644
> --- a/docs/about/deprecated.rst
> +++ b/docs/about/deprecated.rst
> @@ -461,3 +461,11 @@ 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..fee7079afa 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 + NBD'"
> +" instead.");
Convention: an error or warning message is a single phrase, with no
newline or trailing punctuation. The simplest way to conform to it is
something like
warn_report("option '-i' is deprecated;"
" use blockdev-mirror with NBD instead.");
> +}
> +
> qmp_migrate(uri, !!blk, blk, !!inc, inc,
> false, false, true, resume, &err);
> if (hmp_handle_error(mon, err)) {
> diff --git a/migration/migration.c b/migration/migration.c
> index 6ba5e145ac..b8b3ba58df 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");
Likewise.
> +}
> +
> if (resume) {
> if (s->state != MIGRATION_STATUS_POSTCOPY_PAUSED) {
> error_setg(errp, "Cannot resume if there is no "
Other than that
Reviewed-by: Markus Armbruster
[PATCH v5 2/7] migration: migrate 'inc' command option is deprecated.
Use blockdev-mirror with NBD instead.
Reviewed-by: Thomas Huth
Acked-by: Stefan Hajnoczi
Signed-off-by: Juan Quintela
---
Improve documentation and style (thanks Markus)
---
docs/about/deprecated.rst | 8
qapi/migration.json| 8 +++-
migration/migration-hmp-cmds.c | 5 +
migration/migration.c | 5 +
4 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
index 2febd2d12f..fc6adf1dea 100644
--- a/docs/about/deprecated.rst
+++ b/docs/about/deprecated.rst
@@ -461,3 +461,11 @@ 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..fee7079afa 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 + NBD'"
+" instead.");
+}
+
qmp_migrate(uri, !!blk, blk, !!inc, inc,
false, false, true, resume, &err);
if (hmp_handle_error(mon, err)) {
diff --git a/migration/migration.c b/migration/migration.c
index 6ba5e145ac..b8b3ba58df 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
