[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 25/28] block/qapi: Convert qmp_query_block() to Block
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 25/28] block/qapi: Convert qmp_query_block() to BlockBackend |
Date: |
Mon, 20 Oct 2014 15:35:51 +0200 |
From: Markus Armbruster <address@hidden>
Much more command code needs conversion. I start with this one
because it's using bdrv_dev_* functions, which I'm about to lift into
BlockBackend.
While there, give bdrv_query_info() internal linkage.
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>
---
block/qapi.c | 15 ++++++++-------
include/block/qapi.h | 3 ---
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/block/qapi.c b/block/qapi.c
index d071ee5..fca981d 100644
--- a/block/qapi.c
+++ b/block/qapi.c
@@ -28,6 +28,7 @@
#include "qapi-visit.h"
#include "qapi/qmp-output-visitor.h"
#include "qapi/qmp/types.h"
+#include "sysemu/block-backend.h"
#ifdef __linux__
#include <linux/fs.h>
#include <sys/ioctl.h>
@@ -264,15 +265,15 @@ void bdrv_query_image_info(BlockDriverState *bs,
}
/* @p_info will be set only on success. */
-void bdrv_query_info(BlockDriverState *bs,
- BlockInfo **p_info,
- Error **errp)
+static void bdrv_query_info(BlockBackend *blk, BlockInfo **p_info,
+ Error **errp)
{
BlockInfo *info = g_malloc0(sizeof(*info));
+ BlockDriverState *bs = blk_bs(blk);
BlockDriverState *bs0;
ImageInfo **p_image_info;
Error *local_err = NULL;
- info->device = g_strdup(bdrv_get_device_name(bs));
+ info->device = g_strdup(blk_name(blk));
info->type = g_strdup("unknown");
info->locked = bdrv_dev_is_medium_locked(bs);
info->removable = bdrv_dev_has_removable_media(bs);
@@ -360,12 +361,12 @@ static BlockStats *bdrv_query_stats(const
BlockDriverState *bs)
BlockInfoList *qmp_query_block(Error **errp)
{
BlockInfoList *head = NULL, **p_next = &head;
- BlockDriverState *bs = NULL;
+ BlockBackend *blk;
Error *local_err = NULL;
- while ((bs = bdrv_next(bs))) {
+ for (blk = blk_next(NULL); blk; blk = blk_next(blk)) {
BlockInfoList *info = g_malloc0(sizeof(*info));
- bdrv_query_info(bs, &info->value, &local_err);
+ bdrv_query_info(blk, &info->value, &local_err);
if (local_err) {
error_propagate(errp, local_err);
goto err;
diff --git a/include/block/qapi.h b/include/block/qapi.h
index 0374546..168d788 100644
--- a/include/block/qapi.h
+++ b/include/block/qapi.h
@@ -36,9 +36,6 @@ int bdrv_query_snapshot_info_list(BlockDriverState *bs,
void bdrv_query_image_info(BlockDriverState *bs,
ImageInfo **p_info,
Error **errp);
-void bdrv_query_info(BlockDriverState *bs,
- BlockInfo **p_info,
- Error **errp);
void bdrv_snapshot_dump(fprintf_function func_fprintf, void *f,
QEMUSnapshotInfo *sn);
--
1.8.3.1
- [Qemu-devel] [PULL 14/28] block: Merge BlockBackend and BlockDriverState name spaces, (continued)
- [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, 2014/10/20
- [Qemu-devel] [PULL 25/28] block/qapi: Convert qmp_query_block() to BlockBackend,
Kevin Wolf <=
- [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