On Mon, Jan 29, 2024 at 11:30:53PM +0300, Michael Tokarev wrote:
> 23.01.2024 09:42, Het Gala:
> > 'uri' argument should be optional, as 'uri' and 'channels'
> > arguments are mutally exclusive in nature.
> >
> > Fixes: 074dbce5fcce (migration: New migrate and
> > migrate-incoming argument 'channels')
> > Signed-off-by: Het Gala <het.g...@nutanix.com>
> > ---
> > qapi/migration.json | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/qapi/migration.json b/qapi/migration.json
> > index eb2f883513..197d3faa43 100644
> > --- a/qapi/migration.json
> > +++ b/qapi/migration.json
> > @@ -1757,7 +1757,7 @@
> > #
> > ##
> > { 'command': 'migrate',
> > - 'data': {'uri': 'str',
> > + 'data': {'*uri': 'str',
> > '*channels': [ 'MigrationChannel' ],
> > '*blk': { 'type': 'bool', 'features': [ 'deprecated' ] },
> > '*inc': { 'type': 'bool', 'features': [ 'deprecated' ] },
>
> This seems like a stable material too, - please let me know if it is not.
Yes it is. I used to be more careful on copying stable at least in the
commit message when I post patches, but forgot to do so when start picking
up..
Note that it's already merged in master 57fd4b4e10, while there should be a
test case to land later when ready (which won't need to copy stable).
Since at it, just to double check how stable works for us: as long as the
commit has "Cc: qemu-sta...@nongnu.org" when merge should work, even
without the need to reply the patch copying stable list, am I right?
Thanks,
--
Peter Xu
