From patchwork Tue Jul 17 16:00:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 171494 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 49EC82C00BA for ; Wed, 18 Jul 2012 02:58:06 +1000 (EST) Received: from localhost ([::1]:51708 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SrADu-0007rS-Ms for incoming@patchwork.ozlabs.org; Tue, 17 Jul 2012 12:02:06 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38365) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SrACy-00074q-5Q for qemu-devel@nongnu.org; Tue, 17 Jul 2012 12:01:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SrACs-0005nO-0W for qemu-devel@nongnu.org; Tue, 17 Jul 2012 12:01:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:61216) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SrACr-0005n9-Nw for qemu-devel@nongnu.org; Tue, 17 Jul 2012 12:01:01 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q6HG10Up032017 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 17 Jul 2012 12:01:00 -0400 Received: from dhcp-5-188.str.redhat.com (vpn1-6-35.ams2.redhat.com [10.36.6.35]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q6HG0dqe007516; Tue, 17 Jul 2012 12:00:59 -0400 From: Kevin Wolf To: anthony@codemonkey.ws Date: Tue, 17 Jul 2012 18:00:08 +0200 Message-Id: <1342540838-9027-12-git-send-email-kwolf@redhat.com> In-Reply-To: <1342540838-9027-1-git-send-email-kwolf@redhat.com> References: <1342540838-9027-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 11/41] hd-geometry: Clean up gratuitous goto in hd_geometry_guess() 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 From: Markus Armbruster Signed-off-by: Markus Armbruster Signed-off-by: Kevin Wolf --- hw/hd-geometry.c | 22 ++++++++-------------- 1 files changed, 8 insertions(+), 14 deletions(-) diff --git a/hw/hd-geometry.c b/hw/hd-geometry.c index 1a58894..fb849a3 100644 --- a/hw/hd-geometry.c +++ b/hw/hd-geometry.c @@ -119,8 +119,7 @@ static void guess_chs_for_size(BlockDriverState *bs, void hd_geometry_guess(BlockDriverState *bs, int *pcyls, int *pheads, int *psecs) { - int translation, lba_detected = 0; - int cylinders, heads, secs; + int cylinders, heads, secs, translation; bdrv_get_geometry_hint(bs, &cylinders, &heads, &secs); translation = bdrv_get_translation_hint(bs); @@ -135,23 +134,18 @@ void hd_geometry_guess(BlockDriverState *bs, if (guess_disk_lchs(bs, &cylinders, &heads, &secs) < 0) { /* no LCHS guess: use a standard physical disk geometry */ - default_geometry: guess_chs_for_size(bs, pcyls, pheads, psecs); - if ((lba_detected == 1) && (translation == BIOS_ATA_TRANSLATION_AUTO)) { - if ((*pcyls * *pheads) <= 131072) { - bdrv_set_translation_hint(bs, - BIOS_ATA_TRANSLATION_LARGE); - } else { - bdrv_set_translation_hint(bs, - BIOS_ATA_TRANSLATION_LBA); - } - } } else if (heads > 16) { /* LCHS guess with heads > 16 means that a BIOS LBA translation was active, so a standard physical disk geometry is OK */ - lba_detected = 1; - goto default_geometry; + guess_chs_for_size(bs, pcyls, pheads, psecs); + if (translation == BIOS_ATA_TRANSLATION_AUTO) { + bdrv_set_translation_hint(bs, + *pcyls * *pheads <= 131072 + ? BIOS_ATA_TRANSLATION_LARGE + : BIOS_ATA_TRANSLATION_LBA); + } } else { /* LCHS guess with heads <= 16: use as physical geometry */ *pcyls = cylinders;