From patchwork Fri Jul 6 06:57:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 169342 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1B5C02C01EA for ; Fri, 6 Jul 2012 16:58:47 +1000 (EST) Received: from localhost ([::1]:57685 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sn2V3-0003KQ-0N for incoming@patchwork.ozlabs.org; Fri, 06 Jul 2012 02:58:45 -0400 Received: from eggs.gnu.org ([208.118.235.92]:40071) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sn2Uf-00037W-5h for qemu-devel@nongnu.org; Fri, 06 Jul 2012 02:58:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sn2Ub-0003Lw-EB for qemu-devel@nongnu.org; Fri, 06 Jul 2012 02:58:20 -0400 Received: from oxygen.pond.sub.org ([78.46.104.156]:50606) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sn2Ub-0003Ks-4c for qemu-devel@nongnu.org; Fri, 06 Jul 2012 02:58:17 -0400 Received: from blackfin.pond.sub.org (p5B32A0DA.dip.t-dialin.net [91.50.160.218]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 4E426A5A64; Fri, 6 Jul 2012 08:58:14 +0200 (CEST) Received: by blackfin.pond.sub.org (Postfix, from userid 500) id 4201C600AC; Fri, 6 Jul 2012 08:58:11 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 6 Jul 2012 08:57:52 +0200 Message-Id: <1341557890-17464-15-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.7.6.5 In-Reply-To: <1341557890-17464-1-git-send-email-armbru@redhat.com> References: <1341557890-17464-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 78.46.104.156 Cc: kwolf@redhat.com, blauwirbel@gmail.com, stefanha@linux.vnet.ibm.com, pbonzini@redhat.com Subject: [Qemu-devel] [PATCH 14/32] hd-geometry: Cut out block layer translation middleman X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org hd_geometry_guess() picks geometry and translation. Callers can get the geometry directly, via parameters, but for translation they need to go through the block layer. Add a parameter for translation, so it can optionally be gotten just like geometry. In preparation of purging translation from the block layer, which will happen later in this series. Signed-off-by: Markus Armbruster --- hw/block-common.h | 3 ++- hw/hd-geometry.c | 20 ++++++++++++++------ hw/ide/core.c | 2 +- hw/scsi-disk.c | 4 ++-- hw/virtio-blk.c | 2 +- 5 files changed, 20 insertions(+), 11 deletions(-) diff --git a/hw/block-common.h b/hw/block-common.h index 3a4d4c6..bba817a 100644 --- a/hw/block-common.h +++ b/hw/block-common.h @@ -16,6 +16,7 @@ /* Hard disk geometry */ void hd_geometry_guess(BlockDriverState *bs, - int *pcyls, int *pheads, int *psecs); + int *pcyls, int *pheads, int *psecs, + int *ptrans); #endif diff --git a/hw/hd-geometry.c b/hw/hd-geometry.c index 241aed9..4d746b7 100644 --- a/hw/hd-geometry.c +++ b/hw/hd-geometry.c @@ -117,7 +117,8 @@ static void guess_chs_for_size(BlockDriverState *bs, } void hd_geometry_guess(BlockDriverState *bs, - int *pcyls, int *pheads, int *psecs) + int *pcyls, int *pheads, int *psecs, + int *ptrans) { int cylinders, heads, secs, translation; @@ -129,6 +130,9 @@ void hd_geometry_guess(BlockDriverState *bs, *pcyls = cylinders; *pheads = heads; *psecs = secs; + if (ptrans) { + *ptrans = translation; + } return; } @@ -142,10 +146,10 @@ void hd_geometry_guess(BlockDriverState *bs, translation was active, so a standard physical disk geometry is OK */ guess_chs_for_size(bs, pcyls, pheads, psecs); - bdrv_set_translation_hint(bs, - *pcyls * *pheads <= 131072 - ? BIOS_ATA_TRANSLATION_LARGE - : BIOS_ATA_TRANSLATION_LBA); + translation = *pcyls * *pheads <= 131072 + ? BIOS_ATA_TRANSLATION_LARGE + : BIOS_ATA_TRANSLATION_LBA; + bdrv_set_translation_hint(bs, translation); } else { /* LCHS guess with heads <= 16: use as physical geometry */ *pcyls = cylinders; @@ -153,7 +157,11 @@ void hd_geometry_guess(BlockDriverState *bs, *psecs = secs; /* disable any translation to be in sync with the logical geometry */ - bdrv_set_translation_hint(bs, BIOS_ATA_TRANSLATION_NONE); + translation = BIOS_ATA_TRANSLATION_NONE; + bdrv_set_translation_hint(bs, translation); + } + if (ptrans) { + *ptrans = translation; } bdrv_set_geometry_hint(bs, *pcyls, *pheads, *psecs); trace_hd_geometry_guess(bs, *pcyls, *pheads, *psecs, translation); diff --git a/hw/ide/core.c b/hw/ide/core.c index 0d1bf10..28f04ad 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -1934,7 +1934,7 @@ int ide_init_drive(IDEState *s, BlockDriverState *bs, IDEDriveKind kind, s->drive_kind = kind; bdrv_get_geometry(bs, &nb_sectors); - hd_geometry_guess(bs, &cylinders, &heads, &secs); + hd_geometry_guess(bs, &cylinders, &heads, &secs, NULL); if (cylinders < 1 || cylinders > 16383) { error_report("cyls must be between 1 and 16383"); return -1; diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index dca3945..ecc9d05 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -949,7 +949,7 @@ static int mode_sense_page(SCSIDiskState *s, int page, uint8_t **p_outbuf, break; } /* if a geometry hint is available, use it */ - hd_geometry_guess(bdrv, &cylinders, &heads, &secs); + hd_geometry_guess(bdrv, &cylinders, &heads, &secs, NULL); p[2] = (cylinders >> 16) & 0xff; p[3] = (cylinders >> 8) & 0xff; p[4] = cylinders & 0xff; @@ -983,7 +983,7 @@ static int mode_sense_page(SCSIDiskState *s, int page, uint8_t **p_outbuf, p[2] = 5000 >> 8; p[3] = 5000 & 0xff; /* if a geometry hint is available, use it */ - hd_geometry_guess(bdrv, &cylinders, &heads, &secs); + hd_geometry_guess(bdrv, &cylinders, &heads, &secs, NULL); p[4] = heads & 0xff; p[5] = secs & 0xff; p[6] = s->qdev.blocksize >> 8; diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c index f16c5ce..d2709a7 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -623,7 +623,7 @@ VirtIODevice *virtio_blk_init(DeviceState *dev, VirtIOBlkConf *blk) s->blk = blk; s->rq = NULL; s->sector_mask = (s->conf->logical_block_size / BDRV_SECTOR_SIZE) - 1; - hd_geometry_guess(s->bs, &cylinders, &heads, &secs); + hd_geometry_guess(s->bs, &cylinders, &heads, &secs, NULL); s->vq = virtio_add_queue(&s->vdev, 128, virtio_blk_handle_output);