Am 19.09.2016 um 21:28 hat Eric Blake geschrieben: > On 09/19/2016 11:54 AM, Kevin Wolf wrote: > > In order to remove the necessity to use BlockBackend names in the > > external API, we want to allow qdev device names in all device related > > commands. > > > > This converts blockdev-open/close-tray to accept a qdev device name. > > > > Signed-off-by: Kevin Wolf <kw...@redhat.com> > > --- > > blockdev.c | 61 > > +++++++++++++++++++++++++++++++++++++++------------- > > qapi/block-core.json | 14 ++++++++---- > > qmp-commands.hx | 16 ++++++++------ > > 3 files changed, 66 insertions(+), 25 deletions(-) > > > > > +++ b/qmp-commands.hx > > @@ -4295,7 +4295,7 @@ EQMP > > > > { > > .name = "blockdev-open-tray", > > - .args_type = "device:s,force:b?", > > + .args_type = "device:s?,id:s?,force:b?", > > .mhandler.cmd_new = qmp_marshal_blockdev_open_tray, > > }, > > Let the merge conflicts begin! Commit 33e1666b has landed.
Oh joy. I guess the rebase invalidates all of the R-bs, so I'll drop all of them and resend a v3. Kevin
pgp2HmFM13ep_.pgp
Description: PGP signature