From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54366) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xr2Lc-0006gm-2E for qemu-devel@nongnu.org; Wed, 19 Nov 2014 05:19:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xr2LS-00042X-HN for qemu-devel@nongnu.org; Wed, 19 Nov 2014 05:18:51 -0500 Received: from e06smtp17.uk.ibm.com ([195.75.94.113]:36827) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xr2LS-00042P-8E for qemu-devel@nongnu.org; Wed, 19 Nov 2014 05:18:42 -0500 Received: from /spool/local by e06smtp17.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 19 Nov 2014 10:18:41 -0000 Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id 5879A17D8043 for ; Wed, 19 Nov 2014 10:18:51 +0000 (GMT) Received: from d06av08.portsmouth.uk.ibm.com (d06av08.portsmouth.uk.ibm.com [9.149.37.249]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id sAJAIcji7995824 for ; Wed, 19 Nov 2014 10:18:38 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 sAJAIcib032084 for ; Wed, 19 Nov 2014 03:18:38 -0700 From: Ekaterina Tumanova Date: Wed, 19 Nov 2014 11:17:56 +0100 Message-Id: <1416392276-10408-7-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 6/6] geometry: Target specific hook for s390x in geometry guessing 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 For target-s390x, the behaviour is chosen as follows: If no geo could be guessed from backing device, guess_disk_lchs (partition table guessing) is called. If this is not successful (e.g. image files) geometry is derived from the size of the disk (as before). We have no translation on s390, so we simply set in to NONE. Signed-off-by: Ekaterina Tumanova --- hw/block/Makefile.objs | 6 +++++- hw/block/hd-geometry.c | 36 +++++++++++++++++++++++++++++++----- 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/hw/block/Makefile.objs b/hw/block/Makefile.objs index d4c3ab7..1f7da7a 100644 --- a/hw/block/Makefile.objs +++ b/hw/block/Makefile.objs @@ -1,4 +1,4 @@ -common-obj-y += block.o cdrom.o hd-geometry.o +common-obj-y += block.o cdrom.o common-obj-$(CONFIG_FDC) += fdc.o common-obj-$(CONFIG_SSI_M25P80) += m25p80.o common-obj-$(CONFIG_NAND) += nand.o @@ -13,3 +13,7 @@ obj-$(CONFIG_SH4) += tc58128.o obj-$(CONFIG_VIRTIO) += virtio-blk.o obj-$(CONFIG_VIRTIO) += dataplane/ + +# geometry is target/architecture dependent and therefore needs to be built +# for every target platform +obj-y += hd-geometry.o diff --git a/hw/block/hd-geometry.c b/hw/block/hd-geometry.c index 4972114..b462225 100644 --- a/hw/block/hd-geometry.c +++ b/hw/block/hd-geometry.c @@ -49,11 +49,12 @@ struct partition { /* try to guess the disk logical geometry from the MSDOS partition table. Return 0 if OK, -1 if could not guess */ -static int guess_disk_lchs(BlockBackend *blk, - int *pcylinders, int *pheads, int *psectors) +static int guess_disk_lchs(BlockBackend *blk, uint32_t *pcylinders, + uint32_t *pheads, uint32_t *psectors) { uint8_t buf[BDRV_SECTOR_SIZE]; - int i, heads, sectors, cylinders; + int i; + uint32_t heads, sectors, cylinders; struct partition *p; uint32_t nr_sects; uint64_t nb_sectors; @@ -116,11 +117,11 @@ static void guess_chs_for_size(BlockBackend *blk, *psecs = 63; } +#ifdef TARGET_S390X void hd_geometry_guess(BlockBackend *blk, uint32_t *pcyls, uint32_t *pheads, uint32_t *psecs, int *ptrans) { - int cylinders, heads, secs, translation; struct ProbeGeometry geometry = blk_probe_geometry(blk); if (geometry.rc == 0) { @@ -129,7 +130,32 @@ void hd_geometry_guess(BlockBackend *blk, *pheads = geometry.geo.heads; goto done; } + if (guess_disk_lchs(blk, pcyls, pheads, psecs) == 0) { + goto done; + } + guess_chs_for_size(blk, pcyls, pheads, psecs); +done: + if (ptrans) { + *ptrans = BIOS_ATA_TRANSLATION_NONE; + } + trace_hd_geometry_guess(blk, *pcyls, *pheads, *psecs, + BIOS_ATA_TRANSLATION_NONE); +} +#else +void hd_geometry_guess(BlockBackend *blk, + uint32_t *pcyls, uint32_t *pheads, uint32_t *psecs, + 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 */ guess_chs_for_size(blk, pcyls, pheads, psecs); @@ -157,7 +183,7 @@ done: } trace_hd_geometry_guess(blk, *pcyls, *pheads, *psecs, translation); } - +#endif int hd_bios_chs_auto_trans(uint32_t cyls, uint32_t heads, uint32_t secs) { return cyls <= 1024 && heads <= 16 && secs <= 63 -- 1.8.5.5