From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32886) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VRHyO-00008I-MG for qemu-devel@nongnu.org; Wed, 02 Oct 2013 04:40:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VRHyG-0005RN-6c for qemu-devel@nongnu.org; Wed, 02 Oct 2013 04:39:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48697) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VRHyF-0005RH-Tp for qemu-devel@nongnu.org; Wed, 02 Oct 2013 04:39:48 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r928dl3K031110 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 2 Oct 2013 04:39:47 -0400 From: Max Reitz Date: Wed, 2 Oct 2013 10:39:36 +0200 Message-Id: <1380703180-27493-3-git-send-email-mreitz@redhat.com> In-Reply-To: <1380703180-27493-1-git-send-email-mreitz@redhat.com> References: <1380703180-27493-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v7 2/6] block: Add bdrv_get_specific_info List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Fam Zheng , Stefan Hajnoczi , Max Reitz Add a function for retrieving an ImageInfoSpecific object from a block driver. Signed-off-by: Max Reitz Reviewed-by: Eric Blake --- block.c | 9 +++++++++ block/qapi.c | 3 +++ include/block/block.h | 1 + include/block/block_int.h | 1 + 4 files changed, 14 insertions(+) diff --git a/block.c b/block.c index 93e113a..bb5a19f 100644 --- a/block.c +++ b/block.c @@ -3322,6 +3322,15 @@ int bdrv_get_info(BlockDriverState *bs, BlockDriverInfo *bdi) return drv->bdrv_get_info(bs, bdi); } +ImageInfoSpecific *bdrv_get_specific_info(BlockDriverState *bs) +{ + BlockDriver *drv = bs->drv; + if (drv && drv->bdrv_get_specific_info) { + return drv->bdrv_get_specific_info(bs); + } + return NULL; +} + int bdrv_save_vmstate(BlockDriverState *bs, const uint8_t *buf, int64_t pos, int size) { diff --git a/block/qapi.c b/block/qapi.c index 782051c..ab1dd24 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -134,6 +134,9 @@ void bdrv_query_image_info(BlockDriverState *bs, info->dirty_flag = bdi.is_dirty; info->has_dirty_flag = true; } + info->format_specific = bdrv_get_specific_info(bs); + info->has_format_specific = info->format_specific != NULL; + backing_filename = bs->backing_file; if (backing_filename[0] != '\0') { info->backing_filename = g_strdup(backing_filename); diff --git a/include/block/block.h b/include/block/block.h index f808550..e265124 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -335,6 +335,7 @@ int bdrv_get_flags(BlockDriverState *bs); int bdrv_write_compressed(BlockDriverState *bs, int64_t sector_num, const uint8_t *buf, int nb_sectors); int bdrv_get_info(BlockDriverState *bs, BlockDriverInfo *bdi); +ImageInfoSpecific *bdrv_get_specific_info(BlockDriverState *bs); void bdrv_round_to_clusters(BlockDriverState *bs, int64_t sector_num, int nb_sectors, int64_t *cluster_sector_num, diff --git a/include/block/block_int.h b/include/block/block_int.h index 211087a..17b26b2 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -168,6 +168,7 @@ struct BlockDriver { int (*bdrv_snapshot_load_tmp)(BlockDriverState *bs, const char *snapshot_name); int (*bdrv_get_info)(BlockDriverState *bs, BlockDriverInfo *bdi); + ImageInfoSpecific *(*bdrv_get_specific_info)(BlockDriverState *bs); int (*bdrv_save_vmstate)(BlockDriverState *bs, QEMUIOVector *qiov, int64_t pos); -- 1.8.3.1