[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v3 21/23] blockdev: Convert qmp_eject(), qmp_cha
From: |
Benoît Canet |
Subject: |
Re: [Qemu-devel] [PATCH v3 21/23] blockdev: Convert qmp_eject(), qmp_change_blockdev() to BlockBackend |
Date: |
Mon, 22 Sep 2014 12:08:57 +0000 |
User-agent: |
Mutt/1.5.21 (2010-09-15) |
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 <address@hidden>
> ---
> 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 <address@hidden>
- Re: [Qemu-devel] [PATCH v3 18/23] blockdev: Fix blockdev-add not to create IDE drive (0, 0), (continued)
Re: [Qemu-devel] [PATCH v3 18/23] blockdev: Fix blockdev-add not to create IDE drive (0, 0), Kevin Wolf, 2014/09/29
[Qemu-devel] [PATCH v3 16/23] pc87312: Drop unused members of PC87312State, Markus Armbruster, 2014/09/16
[Qemu-devel] [PATCH v3 21/23] blockdev: Convert qmp_eject(), qmp_change_blockdev() to BlockBackend, Markus Armbruster, 2014/09/16
[Qemu-devel] [PATCH v3 22/23] block: Lift device model API into BlockBackend, Markus Armbruster, 2014/09/16
[Qemu-devel] [PATCH v3 14/23] hw: Convert from BlockDriverState to BlockBackend, mostly, Markus Armbruster, 2014/09/16