From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48589) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bmIry-0007qH-Ak for qemu-devel@nongnu.org; Tue, 20 Sep 2016 07:05:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bmIrw-0004Up-AH for qemu-devel@nongnu.org; Tue, 20 Sep 2016 07:05:45 -0400 Date: Tue, 20 Sep 2016 13:05:34 +0200 From: Kevin Wolf Message-ID: <20160920110534.GC5807@noname.redhat.com> References: <1474304097-5790-1-git-send-email-kwolf@redhat.com> <1474304097-5790-5-git-send-email-kwolf@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="4Ckj6UjgE2iN1+kY" Content-Disposition: inline In-Reply-To: Subject: Re: [Qemu-devel] [PATCH v2 04/10] block: Accept device model name for blockdev-open/close-tray List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eric Blake Cc: qemu-block@nongnu.org, mreitz@redhat.com, jsnow@redhat.com, qemu-devel@nongnu.org --4Ckj6UjgE2iN1+kY Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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. > >=20 > > This converts blockdev-open/close-tray to accept a qdev device name. > >=20 > > Signed-off-by: Kevin Wolf > > --- > > blockdev.c | 61 +++++++++++++++++++++++++++++++++++++++-----= -------- > > qapi/block-core.json | 14 ++++++++---- > > qmp-commands.hx | 16 ++++++++------ > > 3 files changed, 66 insertions(+), 25 deletions(-) > >=20 >=20 > > +++ b/qmp-commands.hx > > @@ -4295,7 +4295,7 @@ EQMP > > =20 > > { > > .name =3D "blockdev-open-tray", > > - .args_type =3D "device:s,force:b?", > > + .args_type =3D "device:s?,id:s?,force:b?", > > .mhandler.cmd_new =3D qmp_marshal_blockdev_open_tray, > > }, >=20 > 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 --4Ckj6UjgE2iN1+kY Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAEBAgAGBQJX4Rf+AAoJEH8JsnLIjy/Wb2AP/1mGsI0pjSx+xXCwOcnilUTx 8qw6DlZY8wdLRh74vnuKHh1mtBLSGPHMn+sztHukbNLPn0t812KSXtWsuqk/M4mO 6bkJpk6fY65qLEVnR+49goklF76tHIJb9M3Nz1b+80XdlGaWn8/yF65i2k8vXuGH 9lM5zunIKMBkNW88tqYR+UqH2G632SzPxOIAvoei6emK92wC9YyZE69Au/o6uKoz 0fjNOGfB68blgzYEd5FqtYzAap+IPuEg6wSmiqklOiYNj8jEGMY40k+Y0sTngeDJ /dqsdQDsZpR7tzUBMFWDIAMxoSefsUGVE4onNg9UmA9MXkNmCS0DWp2z+9Jgtgmg p/JZ2EZ0E5Y8CnEULXOwEFNpJPKBtMLh5fEbYnpHcZE8TgvuYQngKlBc4bBZX0Y5 K2IFIP1dQextU2Peps6UYVuhpWYPBczr42go6pEiLMqJS8VJlTpvOXnBSpReUM/y bLzK8+trDu7XnLCydGejao3Jrj80VUAwOCNxiYku9xR0y25dad3FJ8hCSg/qPzrv 9mk/plzIIKaND0XbP8BIxrTKKqMPKyaSwbZZROV0/Sy4Cl1uMY5HzHcmj9H/+X+Z 1uziEAZVv0nVN0DkCGHewETGz0EFq1MHQ6HAyahX5G9P91IdCqrD9nxAMbVaq4U3 wJtRlnKvN6/fMO6BDF99 =hBzt -----END PGP SIGNATURE----- --4Ckj6UjgE2iN1+kY--