From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45329) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xwx7g-0000Mu-UK for qemu-devel@nongnu.org; Fri, 05 Dec 2014 12:57:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xwx7K-0001Fu-NH for qemu-devel@nongnu.org; Fri, 05 Dec 2014 12:56:56 -0500 Received: from e06smtp12.uk.ibm.com ([195.75.94.108]:46651) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xwx7K-0001FZ-Bg for qemu-devel@nongnu.org; Fri, 05 Dec 2014 12:56:34 -0500 Received: from /spool/local by e06smtp12.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 5 Dec 2014 17:56:33 -0000 Received: from b06cxnps3075.portsmouth.uk.ibm.com (d06relay10.portsmouth.uk.ibm.com [9.149.109.195]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id 794592190043 for ; Fri, 5 Dec 2014 17:56:02 +0000 (GMT) Received: from d06av01.portsmouth.uk.ibm.com (d06av01.portsmouth.uk.ibm.com [9.149.37.212]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id sB5HuUWq62849124 for ; Fri, 5 Dec 2014 17:56:30 GMT Received: from d06av01.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av01.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id sB5HuUZJ004177 for ; Fri, 5 Dec 2014 10:56:30 -0700 From: Ekaterina Tumanova Date: Fri, 5 Dec 2014 18:56:17 +0100 Message-Id: <1417802181-20834-2-git-send-email-tumanova@linux.vnet.ibm.com> In-Reply-To: <1417802181-20834-1-git-send-email-tumanova@linux.vnet.ibm.com> References: <1417802181-20834-1-git-send-email-tumanova@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v3 1/5] block: add bdrv functions for geometry and blocksize List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Public KVM Mailing List Cc: kwolf@redhat.com, dahi@linux.vnet.ibm.com, Ekaterina Tumanova , armbru@redhat.com, mihajlov@linux.vnet.ibm.com, borntraeger@de.ibm.com, stefanha@redhat.com, cornelia.huck@de.ibm.com, pbonzini@redhat.com Add driver functions for geometry and blocksize detection Signed-off-by: Ekaterina Tumanova --- block.c | 35 +++++++++++++++++++++++++++++++++++ include/block/block.h | 13 +++++++++++++ include/block/block_int.h | 5 +++++ 3 files changed, 53 insertions(+) diff --git a/block.c b/block.c index a612594..7b0b804 100644 --- a/block.c +++ b/block.c @@ -548,6 +548,41 @@ void bdrv_refresh_limits(BlockDriverState *bs, Error **errp) } } +/** + * Try to get @bs's logical and physical block size. + * On success, store them in bsz struct. + * On failure, set default blocksize. + */ +void bdrv_probe_blocksizes(BlockDriverState *bs, BlockSizes *bsz) +{ + BlockDriver *drv = bs->drv; + + assert(drv != NULL); + if (drv->bdrv_probe_blocksizes && + !drv->bdrv_probe_blocksizes(bs, bsz)) { + return; + } + bsz->log = BDRV_SECTOR_SIZE; + bsz->phys = BDRV_SECTOR_SIZE; +} + +/** + * Try to get @bs's geometry (cyls, heads, sectos) + * On success, store them in geo struct and return 0. + * On failure return -errno. + */ +int bdrv_probe_geometry(BlockDriverState *bs, hdGeometry *geo) +{ + BlockDriver *drv = bs->drv; + + assert(drv != NULL); + if (drv->bdrv_probe_geometry) { + return drv->bdrv_probe_geometry(bs, geo); + } + + return -1; +} + /* * Create a uniquely-named empty temporary file. * Return 0 upon success, otherwise a negative errno value. diff --git a/include/block/block.h b/include/block/block.h index 5450610..17184b6 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -60,6 +60,17 @@ typedef enum { BDRV_REQ_MAY_UNMAP = 0x4, } BdrvRequestFlags; +typedef struct BlockSizes { + uint32_t phys; + uint32_t log; +} BlockSizes; + +typedef struct hdGeometry { + uint32_t heads; + uint32_t sectors; + uint32_t cylinders; +} hdGeometry; + #define BDRV_O_RDWR 0x0002 #define BDRV_O_SNAPSHOT 0x0008 /* open the file read only and save writes in a snapshot */ #define BDRV_O_TEMPORARY 0x0010 /* delete the file after use */ @@ -538,6 +549,8 @@ AioContext *bdrv_get_aio_context(BlockDriverState *bs); * the old #AioContext is not executing. */ void bdrv_set_aio_context(BlockDriverState *bs, AioContext *new_context); +void bdrv_probe_blocksizes(BlockDriverState *bs, BlockSizes *bsz); +int bdrv_probe_geometry(BlockDriverState *bs, hdGeometry *geo); void bdrv_io_plug(BlockDriverState *bs); void bdrv_io_unplug(BlockDriverState *bs); diff --git a/include/block/block_int.h b/include/block/block_int.h index a1c17b9..16e53e9 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -271,6 +271,11 @@ struct BlockDriver { void (*bdrv_io_unplug)(BlockDriverState *bs); void (*bdrv_flush_io_queue)(BlockDriverState *bs); + /* try to get physical and logical blocksizes */ + int (*bdrv_probe_blocksizes)(BlockDriverState *bs, BlockSizes *bsz); + /* tey to get hard drive geometry (cyls, head, sectors) */ + int (*bdrv_probe_geometry)(BlockDriverState *bs, hdGeometry *geo); + QLIST_ENTRY(BlockDriver) list; }; -- 1.8.5.5