[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 15/29] hd-geometry: Switch to uint32_t to match B
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v3 15/29] hd-geometry: Switch to uint32_t to match BlockConf |
Date: |
Tue, 10 Jul 2012 11:12:41 +0200 |
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 <address@hidden>
---
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 acef082..5b5272b 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"
--
1.7.6.5
- [Qemu-devel] [PATCH v3 09/29] hd-geometry: Clean up gratuitous goto in hd_geometry_guess(), (continued)
- [Qemu-devel] [PATCH v3 09/29] hd-geometry: Clean up gratuitous goto in hd_geometry_guess(), Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 06/29] hd-geometry: Add tracepoints, Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 02/29] vvfat: Fix partition table, Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 08/29] hd-geometry: Factor out guess_chs_for_size(), Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 01/29] fdc: Move floppy geometry guessing back from block.c, Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 11/29] hd-geometry: Cut out block layer translation middleman, Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 10/29] hd-geometry: Clean up confusing use of prior translation hint, Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 03/29] vvfat: Do not clobber the user's geometry, Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 07/29] hd-geometry: Unnest conditional in hd_geometry_guess(), Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 14/29] qdev: Introduce block geometry properties, Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 15/29] hd-geometry: Switch to uint32_t to match BlockConf,
Markus Armbruster <=
- [Qemu-devel] [PATCH v3 12/29] ide pc: Cut out the block layer geometry middleman, Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 21/29] qdev: New property type chs-translation, Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 13/29] blockdev: Save geometry in DriveInfo, Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 18/29] ide: qdev properties for disk geometry, Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 16/29] scsi-hd: qdev properties for disk geometry, Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 17/29] virtio-blk: qdev properties for disk geometry, Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 19/29] qtest: Cover qdev properties for disk geometry, Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 29/29] Relax IDE CHS limits from 16383, 16, 63 to 65535, 16, 255, Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 27/29] hd-geometry: Compute BIOS CHS translation in one place, Markus Armbruster, 2012/07/10
- [Qemu-devel] [PATCH v3 05/29] hd-geometry: Move disk geometry guessing back from block.c, Markus Armbruster, 2012/07/10