[PATCH] migration: Deprecate redundant query-migrate result @blocked

[PATCH] migration: Deprecate redundant query-migrate result @blocked

[Markus Armbruster]

Result @blocked is true when and only when result @blocked-reasons is
present.  It's always non-empty when present.  @blocked is redundant.
It was introduced in commit 3af8554bd0 "migration: Add blocker
information", and has not been released.  This gives us a chance to
fix the interface with minimal fuss.

Unfortunately, we're already too close to the release to risk dropping
it.  Deprecate it instead.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
This is alternative to "[PATCH v2] migration: Drop redundant
query-migrate result @blocked".

 qapi/migration.json | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/qapi/migration.json b/qapi/migration.json
index 9bf0bc4d25..0b17cce46b 100644
--- a/qapi/migration.json
+++ b/qapi/migration.json
@@ -224,9 +224,14 @@
 #        only returned if VFIO device is present, migration is supported by all
 #        VFIO devices and status is 'active' or 'completed' (since 5.2)
 #
+# @blocked-reasons: A list of reasons an outgoing migration is blocked.
+#                   Present and non-empty when migration is blocked.
+#                   (since 6.0)
+#
 # @blocked: True if outgoing migration is blocked (since 6.0)
 #
-# @blocked-reasons: A list of reasons an outgoing migration is blocked (since 6.0)
+# Features:
+# @deprecated: Member @blocked is deprecated.  Use @blocked-reasons instead.
 #
 # Since: 0.14
 ##
@@ -241,7 +246,7 @@
            '*setup-time': 'int',
            '*cpu-throttle-percentage': 'int',
            '*error-desc': 'str',
-           'blocked': 'bool',
+           'blocked': { 'type': 'bool', 'features': [ 'deprecated' ] },
            '*blocked-reasons': ['str'],
            '*postcopy-blocktime' : 'uint32',
            '*postcopy-vcpu-blocktime': ['uint32'],
-- 
2.26.3

Re: [PATCH] migration: Deprecate redundant query-migrate result @blocked

[Daniel P. Berrangé]

On Tue, Apr 20, 2021 at 07:19:06AM +0200, Markus Armbruster wrote:
> Result @blocked is true when and only when result @blocked-reasons is
> present.  It's always non-empty when present.  @blocked is redundant.
> It was introduced in commit 3af8554bd0 "migration: Add blocker
> information", and has not been released.  This gives us a chance to
> fix the interface with minimal fuss.
> 
> Unfortunately, we're already too close to the release to risk dropping
> it.  Deprecate it instead.
> 
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
> This is alternative to "[PATCH v2] migration: Drop redundant
> query-migrate result @blocked".
> 
>  qapi/migration.json | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [PATCH] migration: Deprecate redundant query-migrate result @blocked

[Dr. David Alan Gilbert]

* Daniel P. Berrangé (berrange@redhat.com) wrote:
> On Tue, Apr 20, 2021 at 07:19:06AM +0200, Markus Armbruster wrote:
> > Result @blocked is true when and only when result @blocked-reasons is
> > present.  It's always non-empty when present.  @blocked is redundant.
> > It was introduced in commit 3af8554bd0 "migration: Add blocker
> > information", and has not been released.  This gives us a chance to
> > fix the interface with minimal fuss.
> > 
> > Unfortunately, we're already too close to the release to risk dropping
> > it.  Deprecate it instead.
> > 
> > Signed-off-by: Markus Armbruster <armbru@redhat.com>
> > ---
> > This is alternative to "[PATCH v2] migration: Drop redundant
> > query-migrate result @blocked".
> > 
> >  qapi/migration.json | 9 +++++++--
> >  1 file changed, 7 insertions(+), 2 deletions(-)
> 
> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

Yes,


Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

Peter: Do you want to pick that up directly ?

Dave

> 
> 
> Regards,
> Daniel
> -- 
> |: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
> |: https://libvirt.org         -o-            https://fstop138.berrange.com :|
> |: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
-- 
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK

Re: [PATCH] migration: Deprecate redundant query-migrate result @blocked

[Peter Maydell]

On Tue, 20 Apr 2021 at 10:25, Dr. David Alan Gilbert
<dgilbert@redhat.com> wrote:
>
> * Daniel P. Berrangé (berrange@redhat.com) wrote:
> > On Tue, Apr 20, 2021 at 07:19:06AM +0200, Markus Armbruster wrote:
> > > Result @blocked is true when and only when result @blocked-reasons is
> > > present.  It's always non-empty when present.  @blocked is redundant.
> > > It was introduced in commit 3af8554bd0 "migration: Add blocker
> > > information", and has not been released.  This gives us a chance to
> > > fix the interface with minimal fuss.
> > >
> > > Unfortunately, we're already too close to the release to risk dropping
> > > it.  Deprecate it instead.
> > >
> > > Signed-off-by: Markus Armbruster <armbru@redhat.com>
> > > ---
> > > This is alternative to "[PATCH v2] migration: Drop redundant
> > > query-migrate result @blocked".
> > >
> > >  qapi/migration.json | 9 +++++++--
> > >  1 file changed, 7 insertions(+), 2 deletions(-)
> >
> > Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
>
> Yes,
>
>
> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
>
> Peter: Do you want to pick that up directly ?

Yep; applied to master for 6.0.

thanks
-- PMM