From: Peter Xu <peterx@redhat.com>
To: Michael Tokarev <mjt@tls.msk.ru>
Cc: Het Gala <het.gala@nutanix.com>,
qemu-devel@nongnu.org, berrange@redhat.com, farosas@suse.de,
armbru@redhat.com, qemu-stable <qemu-stable@nongnu.org>
Subject: Re: [PATCH] Make 'uri' optional for migrate QAPI
Date: Tue, 30 Jan 2024 09:35:28 +0800 [thread overview]
Message-ID: <ZbhSYE2o35oZH0wi@x1n> (raw)
In-Reply-To: <1023dde3-4de0-4ec1-85a6-238ed8e16454@tls.msk.ru>
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.gala@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-stable@nongnu.org" when merge should work, even
without the need to reply the patch copying stable list, am I right?
Thanks,
--
Peter Xu
next prev parent reply other threads:[~2024-01-30 1:36 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-23 6:42 [PATCH] Make 'uri' optional for migrate QAPI Het Gala
2024-01-23 6:47 ` Het Gala
2024-01-23 8:21 ` Daniel P. Berrangé
2024-01-24 1:43 ` Peter Xu
2024-01-24 4:33 ` Het Gala
2024-01-26 14:10 ` Het Gala
2024-01-26 14:30 ` Daniel P. Berrangé
2024-01-29 20:30 ` Michael Tokarev
2024-01-29 20:56 ` Fabiano Rosas
2024-01-30 1:35 ` Peter Xu [this message]
2024-01-30 6:45 ` Michael Tokarev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZbhSYE2o35oZH0wi@x1n \
--to=peterx@redhat.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=farosas@suse.de \
--cc=het.gala@nutanix.com \
--cc=mjt@tls.msk.ru \
--cc=qemu-devel@nongnu.org \
--cc=qemu-stable@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).