From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54487) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XW2QR-000682-Kz for qemu-devel@nongnu.org; Mon, 22 Sep 2014 08:09:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XW2QJ-0006xw-AF for qemu-devel@nongnu.org; Mon, 22 Sep 2014 08:09:03 -0400 Received: from dew.nodalink.com ([95.130.14.197]:59622) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XW2QJ-0006p8-25 for qemu-devel@nongnu.org; Mon, 22 Sep 2014 08:08:55 -0400 Date: Mon, 22 Sep 2014 12:08:57 +0000 From: =?iso-8859-1?Q?Beno=EEt?= Canet Message-ID: <20140922120857.GC20345@nodalink.com> References: <1410891148-28849-1-git-send-email-armbru@redhat.com> <1410891148-28849-22-git-send-email-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1410891148-28849-22-git-send-email-armbru@redhat.com> Subject: Re: [Qemu-devel] [PATCH v3 21/23] blockdev: Convert qmp_eject(), qmp_change_blockdev() to BlockBackend List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: kwolf@redhat.com, famz@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com, stefanha@redhat.com, benoit.canet@nodalink.com On Tue, Sep 16, 2014 at 08:12:26PM +0200, Markus Armbruster wrote: > Much more command code needs conversion. I'm converting these now > because they's using bdrv_dev_* functions, which I'm about to lift > into BlockBackend. > > Signed-off-by: Markus Armbruster > --- > blockdev.c | 20 ++++++++++++-------- > 1 file changed, 12 insertions(+), 8 deletions(-) > > diff --git a/blockdev.c b/blockdev.c > index e218c59..e115bde 100644 > --- a/blockdev.c > +++ b/blockdev.c > @@ -1502,8 +1502,10 @@ exit: > } > > > -static void eject_device(BlockDriverState *bs, int force, Error **errp) > +static void eject_device(BlockBackend *blk, int force, Error **errp) > { > + BlockDriverState *bs = blk_bs(blk); > + > if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_EJECT, errp)) { > return; > } > @@ -1527,15 +1529,15 @@ static void eject_device(BlockDriverState *bs, int force, Error **errp) > > void qmp_eject(const char *device, bool has_force, bool force, Error **errp) > { > - BlockDriverState *bs; > + BlockBackend *blk; > > - bs = bdrv_find(device); > - if (!bs) { > + blk = blk_by_name(device); > + if (!blk) { > error_set(errp, QERR_DEVICE_NOT_FOUND, device); > return; > } > > - eject_device(bs, force, errp); > + eject_device(blk, force, errp); > } > > void qmp_block_passwd(bool has_device, const char *device, > @@ -1594,16 +1596,18 @@ static void qmp_bdrv_open_encrypted(BlockDriverState *bs, const char *filename, > void qmp_change_blockdev(const char *device, const char *filename, > const char *format, Error **errp) > { > + BlockBackend *blk; > BlockDriverState *bs; > BlockDriver *drv = NULL; > int bdrv_flags; > Error *err = NULL; > > - bs = bdrv_find(device); > - if (!bs) { > + blk = blk_by_name(device); > + if (!blk) { > error_set(errp, QERR_DEVICE_NOT_FOUND, device); > return; > } > + bs = blk_bs(blk); > > if (format) { > drv = bdrv_find_whitelisted_format(format, bs->read_only); > @@ -1613,7 +1617,7 @@ void qmp_change_blockdev(const char *device, const char *filename, > } > } > > - eject_device(bs, 0, &err); > + eject_device(blk, 0, &err); > if (err) { > error_propagate(errp, err); > return; > -- > 1.9.3 > Reviewed-by: Benoit Canet