From patchwork Tue Jul 17 16:00:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 171509 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 8D9022C00BD for ; Wed, 18 Jul 2012 03:27:43 +1000 (EST) Received: from localhost ([::1]:60322 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SrBYj-0004Fo-M0 for incoming@patchwork.ozlabs.org; Tue, 17 Jul 2012 13:27:41 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38458) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SrAD4-0007NM-KJ for qemu-devel@nongnu.org; Tue, 17 Jul 2012 12:01:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SrAD0-0005qY-53 for qemu-devel@nongnu.org; Tue, 17 Jul 2012 12:01:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:62998) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SrACz-0005qE-TL for qemu-devel@nongnu.org; Tue, 17 Jul 2012 12:01:10 -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 q6HG18sZ020010 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 17 Jul 2012 12:01:08 -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 q6HG0dqk007516; Tue, 17 Jul 2012 12:01:07 -0400 From: Kevin Wolf To: anthony@codemonkey.ws Date: Tue, 17 Jul 2012 18:00:14 +0200 Message-Id: <1342540838-9027-18-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 17/41] hd-geometry: Switch to uint32_t to match BlockConf 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 Best to use the same type, to avoid unwanted truncation or sign extension. BlockConf can't use plain int for cyls, heads and secs, because integer properties require an exact width. Signed-off-by: Markus Armbruster Signed-off-by: Kevin Wolf --- hw/block-common.h | 2 +- hw/hd-geometry.c | 4 ++-- hw/ide/core.c | 2 +- hw/scsi-disk.c | 2 +- hw/virtio-blk.c | 2 +- trace-events | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/block-common.h b/hw/block-common.h index bba817a..2f65186 100644 --- a/hw/block-common.h +++ b/hw/block-common.h @@ -16,7 +16,7 @@ /* Hard disk geometry */ void hd_geometry_guess(BlockDriverState *bs, - int *pcyls, int *pheads, int *psecs, + uint32_t *pcyls, uint32_t *pheads, uint32_t *psecs, int *ptrans); #endif diff --git a/hw/hd-geometry.c b/hw/hd-geometry.c index 4d746b7..7626cbb 100644 --- a/hw/hd-geometry.c +++ b/hw/hd-geometry.c @@ -98,7 +98,7 @@ static int guess_disk_lchs(BlockDriverState *bs, } static void guess_chs_for_size(BlockDriverState *bs, - int *pcyls, int *pheads, int *psecs) + uint32_t *pcyls, uint32_t *pheads, uint32_t *psecs) { uint64_t nb_sectors; int cylinders; @@ -117,7 +117,7 @@ static void guess_chs_for_size(BlockDriverState *bs, } void hd_geometry_guess(BlockDriverState *bs, - int *pcyls, int *pheads, int *psecs, + uint32_t *pcyls, uint32_t *pheads, uint32_t *psecs, int *ptrans) { int cylinders, heads, secs, translation; diff --git a/hw/ide/core.c b/hw/ide/core.c index 7f5ad07..f1966e3 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -1927,7 +1927,7 @@ int ide_init_drive(IDEState *s, BlockDriverState *bs, IDEDriveKind kind, const char *version, const char *serial, const char *model, uint64_t wwn) { - int cylinders, heads, secs; + uint32_t cylinders, heads, secs; uint64_t nb_sectors; s->bs = bs; diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index fc077f5..c881acf 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -968,7 +968,7 @@ static int mode_sense_page(SCSIDiskState *s, int page, uint8_t **p_outbuf, }; BlockDriverState *bdrv = s->qdev.conf.bs; - int cylinders, heads, secs; + uint32_t cylinders, heads, secs; uint8_t *p = *p_outbuf; if ((mode_sense_valid[page] & (1 << s->qdev.type)) == 0) { diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c index d2709a7..4344e28 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -590,7 +590,7 @@ static const BlockDevOps virtio_block_ops = { VirtIODevice *virtio_blk_init(DeviceState *dev, VirtIOBlkConf *blk) { VirtIOBlock *s; - int cylinders, heads, secs; + uint32_t cylinders, heads, secs; static int virtio_blk_id; DriveInfo *dinfo; diff --git a/trace-events b/trace-events index 5f27f1a..8b1fb24 100644 --- a/trace-events +++ b/trace-events @@ -143,7 +143,7 @@ ecc_diag_mem_readb(uint64_t addr, uint32_t ret) "Read diagnostic %"PRId64"= %02x # hw/hd-geometry.c hd_geometry_lchs_guess(void *bs, int cyls, int heads, int secs) "bs %p LCHS %d %d %d" -hd_geometry_guess(void *bs, int cyls, int heads, int secs, int trans) "bs %p CHS %d %d %d trans %d" +hd_geometry_guess(void *bs, uint32_t cyls, uint32_t heads, uint32_t secs, int trans) "bs %p CHS %u %u %u trans %d" # hw/jazz-led.c jazz_led_read(uint64_t addr, uint8_t val) "read addr=0x%"PRIx64": 0x%x"