From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54355) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xr2LZ-0006dJ-Gt for qemu-devel@nongnu.org; Wed, 19 Nov 2014 05:18:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xr2LQ-00041y-EE for qemu-devel@nongnu.org; Wed, 19 Nov 2014 05:18:49 -0500 Received: from e06smtp16.uk.ibm.com ([195.75.94.112]:54051) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xr2LQ-00041p-5O for qemu-devel@nongnu.org; Wed, 19 Nov 2014 05:18:40 -0500 Received: from /spool/local by e06smtp16.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 19 Nov 2014 10:18:39 -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 53DA02190056 for ; Wed, 19 Nov 2014 10:18:09 +0000 (GMT) Received: from d06av08.portsmouth.uk.ibm.com (d06av08.portsmouth.uk.ibm.com [9.149.37.249]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id sAJAIaPj18219400 for ; Wed, 19 Nov 2014 10:18:36 GMT Received: from d06av08.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av08.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id sAJAIZXW031904 for ; Wed, 19 Nov 2014 03:18:35 -0700 From: Ekaterina Tumanova Date: Wed, 19 Nov 2014 11:17:55 +0100 Message-Id: <1416392276-10408-6-git-send-email-tumanova@linux.vnet.ibm.com> In-Reply-To: <1416392276-10408-1-git-send-email-tumanova@linux.vnet.ibm.com> References: <1416392276-10408-1-git-send-email-tumanova@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v2 5/6] geometry: Call backend function to detect 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 hd_geometry_guess function autodetects the drive geometry. This patch adds a block backend call, that probes the backing device geometry. If the inner driver method is implemented and succeeds (currently only DASDs), the blkconf_geometry will pass-through the backing device geometry. Signed-off-by: Ekaterina Tumanova --- hw/block/block.c | 11 +++++++++++ hw/block/hd-geometry.c | 9 +++++++++ hw/block/virtio-blk.c | 1 + include/hw/block/block.h | 1 + 4 files changed, 22 insertions(+) diff --git a/hw/block/block.c b/hw/block/block.c index a625773..f1d29bc 100644 --- a/hw/block/block.c +++ b/hw/block/block.c @@ -25,6 +25,17 @@ void blkconf_serial(BlockConf *conf, char **serial) } } +void blkconf_blocksizes(BlockConf *conf) +{ + BlockBackend *blk = conf->blk; + struct ProbeBlockSize blocksize = blk_probe_blocksizes(blk); + + if (blocksize.rc == 0) { + conf->physical_block_size = blocksize.size.phys; + conf->logical_block_size = blocksize.size.log; + } +} + void blkconf_geometry(BlockConf *conf, int *ptrans, unsigned cyls_max, unsigned heads_max, unsigned secs_max, Error **errp) diff --git a/hw/block/hd-geometry.c b/hw/block/hd-geometry.c index 6fcf74d..4972114 100644 --- a/hw/block/hd-geometry.c +++ b/hw/block/hd-geometry.c @@ -121,6 +121,14 @@ void hd_geometry_guess(BlockBackend *blk, int *ptrans) { int cylinders, heads, secs, translation; + struct ProbeGeometry geometry = blk_probe_geometry(blk); + + if (geometry.rc == 0) { + *pcyls = geometry.geo.cylinders; + *psecs = geometry.geo.sectors; + *pheads = geometry.geo.heads; + goto done; + } if (guess_disk_lchs(blk, &cylinders, &heads, &secs) < 0) { /* no LCHS guess: use a standard physical disk geometry */ @@ -143,6 +151,7 @@ void hd_geometry_guess(BlockBackend *blk, the logical geometry */ translation = BIOS_ATA_TRANSLATION_NONE; } +done: if (ptrans) { *ptrans = translation; } diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index b19b102..6f01565 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -745,6 +745,7 @@ static void virtio_blk_device_realize(DeviceState *dev, Error **errp) error_propagate(errp, err); return; } + blkconf_blocksizes(&conf->conf); virtio_init(vdev, "virtio-blk", VIRTIO_ID_BLOCK, sizeof(struct virtio_blk_config)); diff --git a/include/hw/block/block.h b/include/hw/block/block.h index 0d0ce9a..856bf75 100644 --- a/include/hw/block/block.h +++ b/include/hw/block/block.h @@ -63,6 +63,7 @@ void blkconf_serial(BlockConf *conf, char **serial); void blkconf_geometry(BlockConf *conf, int *trans, unsigned cyls_max, unsigned heads_max, unsigned secs_max, Error **errp); +void blkconf_blocksizes(BlockConf *conf); /* Hard disk geometry */ -- 1.8.5.5