From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40913) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqlRQ-0004dc-55 for qemu-devel@nongnu.org; Tue, 18 Nov 2014 11:15:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XqlRG-0004sD-Ij for qemu-devel@nongnu.org; Tue, 18 Nov 2014 11:15:43 -0500 Received: from e06smtp14.uk.ibm.com ([195.75.94.110]:55751) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqlRG-0004qY-9D for qemu-devel@nongnu.org; Tue, 18 Nov 2014 11:15:34 -0500 Received: from /spool/local by e06smtp14.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 18 Nov 2014 16:15:27 -0000 Received: from b06cxnps3075.portsmouth.uk.ibm.com (d06relay10.portsmouth.uk.ibm.com [9.149.109.195]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id B1EAD17D8047 for ; Tue, 18 Nov 2014 16:15:36 +0000 (GMT) Received: from d06av04.portsmouth.uk.ibm.com (d06av04.portsmouth.uk.ibm.com [9.149.37.216]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id sAIGFOjr17170712 for ; Tue, 18 Nov 2014 16:15:24 GMT Received: from d06av04.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av04.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id sAIGFNXq018666 for ; Tue, 18 Nov 2014 09:15:24 -0700 Received: from [9.156.34.39] (tumanova.moscow-rstl.ru.ibm.com [9.156.34.39] (may be forged)) by d06av04.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id sAIGFNMY018623 for ; Tue, 18 Nov 2014 09:15:23 -0700 Message-ID: <546B709B.7080501@linux.vnet.ibm.com> Date: Tue, 18 Nov 2014 19:15:23 +0300 From: Ekaterina Tumanova MIME-Version: 1.0 References: <1416327001-22278-2-git-send-email-tumanova@linux.vnet.ibm.com> In-Reply-To: <1416327001-22278-2-git-send-email-tumanova@linux.vnet.ibm.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] Fwd: [PATCH v2 1/6] geometry: add bdrv functions for geometry and blocksize List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel copying to mail list -------- Forwarded Message -------- Subject: [PATCH v2 1/6] geometry: add bdrv functions for geometry and blocksize Date: Tue, 18 Nov 2014 17:09:56 +0100 From: Ekaterina Tumanova To: armbru@redhat.com, pbonzini@redhat.com, stefanha@redhat.com, kwolf@redhat.com CC: borntraeger@de.ibm.com, cornelia.huck@de.ibm.com, dahi@linux.vnet.ibm.com, mihajlov@linux.vnet.ibm.com, Ekaterina Tumanova Add driver functions for geometry and blocksize detection Signed-off-by: Ekaterina Tumanova --- block.c | 26 ++++++++++++++++++++++++++ include/block/block.h | 20 ++++++++++++++++++++ include/block/block_int.h | 3 +++ 3 files changed, 49 insertions(+) diff --git a/block.c b/block.c index a612594..5df35cf 100644 --- a/block.c +++ b/block.c @@ -548,6 +548,32 @@ void bdrv_refresh_limits(BlockDriverState *bs, Error **errp) } } +struct ProbeBlockSize bdrv_probe_blocksizes(BlockDriverState *bs) +{ + BlockDriver *drv = bs->drv; + struct ProbeBlockSize err_geo = { .rc = -1 }; + + assert(drv != NULL); + if (drv->bdrv_probe_blocksizes) { + return drv->bdrv_probe_blocksizes(bs); + } + + return err_geo; +} + +struct ProbeGeometry bdrv_probe_geometry(BlockDriverState *bs) +{ + BlockDriver *drv = bs->drv; + struct ProbeGeometry err_geo = { .rc = -1 }; + + assert(drv != NULL); + if (drv->bdrv_probe_geometry) { + return drv->bdrv_probe_geometry(bs); + } + + return err_geo; +} + /* * 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..3287dbc 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -60,6 +60,24 @@ typedef enum { BDRV_REQ_MAY_UNMAP = 0x4, } BdrvRequestFlags; +struct ProbeBlockSize { + int rc; + struct BlockSize { + uint16_t phys; + uint16_t log; + } size; +}; + +struct ProbeGeometry { + int rc; + struct HDGeometry { + uint32_t heads; + uint32_t sectors; + uint32_t cylinders; + uint32_t start; + } geo; +}; + #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 +556,8 @@ AioContext *bdrv_get_aio_context(BlockDriverState *bs); * the old #AioContext is not executing. */ void bdrv_set_aio_context(BlockDriverState *bs, AioContext *new_context); +struct ProbeBlockSize bdrv_probe_blocksizes(BlockDriverState *bs); +struct ProbeGeometry bdrv_probe_geometry(BlockDriverState *bs); 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..830e564 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -271,6 +271,9 @@ struct BlockDriver { void (*bdrv_io_unplug)(BlockDriverState *bs); void (*bdrv_flush_io_queue)(BlockDriverState *bs); + struct ProbeBlockSize (*bdrv_probe_blocksizes)(BlockDriverState *bs); + struct ProbeGeometry (*bdrv_probe_geometry)(BlockDriverState *bs); + QLIST_ENTRY(BlockDriver) list; }; -- 1.8.5.5