[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 26/28] blockdev: Convert qmp_eject(), qmp_change_bloc
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 26/28] blockdev: Convert qmp_eject(), qmp_change_blockdev() to BlockBackend |
Date: |
Mon, 20 Oct 2014 15:35:52 +0200 |
From: Markus Armbruster <address@hidden>
Much more command code needs conversion. I'm converting these now
because they're using bdrv_dev_* functions, which I'm about to lift
into BlockBackend.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: BenoƮt Canet <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
blockdev.c | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 2a3d908..a32d84c 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -1593,8 +1593,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;
}
@@ -1618,15 +1620,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,
@@ -1685,16 +1687,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);
@@ -1704,7 +1708,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.8.3.1
- [Qemu-devel] [PULL 15/28] block: Eliminate DriveInfo member bdrv, use blk_by_legacy_dinfo(), (continued)
- [Qemu-devel] [PULL 15/28] block: Eliminate DriveInfo member bdrv, use blk_by_legacy_dinfo(), Kevin Wolf, 2014/10/20
- [Qemu-devel] [PULL 14/28] block: Merge BlockBackend and BlockDriverState name spaces, Kevin Wolf, 2014/10/20
- [Qemu-devel] [PULL 16/28] block: Rename BlockDriverAIOCB* to BlockAIOCB*, Kevin Wolf, 2014/10/20
- [Qemu-devel] [PULL 17/28] block: Rename BlockDriverCompletionFunc to BlockCompletionFunc, Kevin Wolf, 2014/10/20
- [Qemu-devel] [PULL 19/28] virtio-blk: Rename VirtIOBlkConf variables to conf, Kevin Wolf, 2014/10/20
- [Qemu-devel] [PULL 18/28] virtio-blk: Drop redundant VirtIOBlock member conf, Kevin Wolf, 2014/10/20
- [Qemu-devel] [PULL 21/28] ide: Complete conversion from BlockDriverState to BlockBackend, Kevin Wolf, 2014/10/20
- [Qemu-devel] [PULL 24/28] blockdev: Fix blockdev-add not to create DriveInfo, Kevin Wolf, 2014/10/20
- [Qemu-devel] [PULL 23/28] blockdev: Drop superfluous DriveInfo member id, Kevin Wolf, 2014/10/20
- [Qemu-devel] [PULL 22/28] pc87312: Drop unused members of PC87312State, Kevin Wolf, 2014/10/20
- [Qemu-devel] [PULL 26/28] blockdev: Convert qmp_eject(), qmp_change_blockdev() to BlockBackend,
Kevin Wolf <=
- [Qemu-devel] [PULL 25/28] block/qapi: Convert qmp_query_block() to BlockBackend, Kevin Wolf, 2014/10/20
- [Qemu-devel] [PULL 28/28] block: Make device model's references to BlockBackend strong, Kevin Wolf, 2014/10/20
- [Qemu-devel] [PULL 27/28] block: Lift device model API into BlockBackend, Kevin Wolf, 2014/10/20
- [Qemu-devel] [PULL 20/28] hw: Convert from BlockDriverState to BlockBackend, mostly, Kevin Wolf, 2014/10/20
- Re: [Qemu-devel] [PULL 00/28] Block patches, Peter Maydell, 2014/10/22