From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51382) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xr5py-00040b-Dd for qemu-devel@nongnu.org; Wed, 19 Nov 2014 09:02:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xr5pp-0005kc-C9 for qemu-devel@nongnu.org; Wed, 19 Nov 2014 09:02:26 -0500 Received: from e06smtp10.uk.ibm.com ([195.75.94.106]:42090) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xr5pp-0005kY-2U for qemu-devel@nongnu.org; Wed, 19 Nov 2014 09:02:17 -0500 Received: from /spool/local by e06smtp10.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 19 Nov 2014 14:02:12 -0000 Received: from b06cxnps3075.portsmouth.uk.ibm.com (d06relay10.portsmouth.uk.ibm.com [9.149.109.195]) by d06dlp03.portsmouth.uk.ibm.com (Postfix) with ESMTP id BA8DC1B08051 for ; Wed, 19 Nov 2014 14:02:20 +0000 (GMT) Received: from d06av10.portsmouth.uk.ibm.com (d06av10.portsmouth.uk.ibm.com [9.149.37.251]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id sAJE28YP4587814 for ; Wed, 19 Nov 2014 14:02:08 GMT Received: from d06av10.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av10.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id sAJE28hN026867 for ; Wed, 19 Nov 2014 07:02:08 -0700 From: Ekaterina Tumanova Date: Wed, 19 Nov 2014 15:01:56 +0100 Message-Id: <1416405716-21624-1-git-send-email-tumanova@linux.vnet.ibm.com> In-Reply-To: <546C8161.10100@de.ibm.com> References: <546C8161.10100@de.ibm.com> Subject: [Qemu-devel] [PATCH] geometry: fix i386 compilation 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 Signed-off-by: Ekaterina Tumanova --- hw/block/hd-geometry.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/block/hd-geometry.c b/hw/block/hd-geometry.c index b462225..905d2c6 100644 --- a/hw/block/hd-geometry.c +++ b/hw/block/hd-geometry.c @@ -147,7 +147,8 @@ void hd_geometry_guess(BlockBackend *blk, uint32_t *pcyls, uint32_t *pheads, uint32_t *psecs, int *ptrans) { - int cylinders, heads, secs, translation; + uint32_t cylinders, heads, secs; + int translation = BIOS_ATA_TRANSLATION_NONE; struct ProbeGeometry geometry = blk_probe_geometry(blk); if (geometry.rc == 0) { @@ -173,9 +174,6 @@ void hd_geometry_guess(BlockBackend *blk, *pcyls = cylinders; *pheads = heads; *psecs = secs; - /* disable any translation to be in sync with - the logical geometry */ - translation = BIOS_ATA_TRANSLATION_NONE; } done: if (ptrans) { -- 1.8.5.5