From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52526) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZcK9-00054I-Dk for qemu-devel@nongnu.org; Thu, 02 Oct 2014 05:05:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XZcK2-0002Rt-Mq for qemu-devel@nongnu.org; Thu, 02 Oct 2014 05:05:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:21419) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZcK2-0002Rb-Fo for qemu-devel@nongnu.org; Thu, 02 Oct 2014 05:05:14 -0400 From: Markus Armbruster Date: Thu, 2 Oct 2014 11:04:55 +0200 Message-Id: <1412240698-21695-21-git-send-email-armbru@redhat.com> In-Reply-To: <1412240698-21695-1-git-send-email-armbru@redhat.com> References: <1412240698-21695-1-git-send-email-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v5 20/23] block/qapi: Convert qmp_query_block() to BlockBackend List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, benoit.canet@nodalink.com, stefanha@redhat.com, mreitz@redhat.com 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 Reviewed-by: Beno=C3=AEt Canet Reviewed-by: Max Reitz Reviewed-by: Kevin Wolf --- 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 #include @@ -264,15 +265,15 @@ void bdrv_query_image_info(BlockDriverState *bs, } =20 /* @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 =3D g_malloc0(sizeof(*info)); + BlockDriverState *bs =3D blk_bs(blk); BlockDriverState *bs0; ImageInfo **p_image_info; Error *local_err =3D NULL; - info->device =3D g_strdup(bdrv_get_device_name(bs)); + info->device =3D g_strdup(blk_name(blk)); info->type =3D g_strdup("unknown"); info->locked =3D bdrv_dev_is_medium_locked(bs); info->removable =3D bdrv_dev_has_removable_media(bs); @@ -360,12 +361,12 @@ static BlockStats *bdrv_query_stats(const BlockDriv= erState *bs) BlockInfoList *qmp_query_block(Error **errp) { BlockInfoList *head =3D NULL, **p_next =3D &head; - BlockDriverState *bs =3D NULL; + BlockBackend *blk; Error *local_err =3D NULL; =20 - while ((bs =3D bdrv_next(bs))) { + for (blk =3D blk_next(NULL); blk; blk =3D blk_next(blk)) { BlockInfoList *info =3D 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); =20 void bdrv_snapshot_dump(fprintf_function func_fprintf, void *f, QEMUSnapshotInfo *sn); --=20 1.9.3