On Fri, Jun 29, 2012 at 3:34 PM, Markus Armbruster <arm...@redhat.com> wrote: > Best to use the same type, to avoid unwanted truncation or sign > extension.
Awesome patch! :-) > > BlockConf can't use plain int for cyls, heads and secs, because > integer properties require an exact width. > > Signed-off-by: Markus Armbruster <arm...@redhat.com> > --- > blockdev.h | 2 +- > hw/hd-geometry.c | 4 ++-- > hw/ide/core.c | 2 +- > hw/scsi-disk.c | 2 +- > hw/virtio-blk.c | 2 +- > 5 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/blockdev.h b/blockdev.h > index 5288cc8..4f29c8b 100644 > --- a/blockdev.h > +++ b/blockdev.h > @@ -66,7 +66,7 @@ int do_drive_del(Monitor *mon, const QDict *qdict, QObject > **ret_data); > > /* 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 208cb42..6dd5713 100644 > --- a/hw/hd-geometry.c > +++ b/hw/hd-geometry.c > @@ -89,7 +89,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; > @@ -108,7 +108,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 4a54833..d8cd2a6 100644 > --- a/hw/ide/core.c > +++ b/hw/ide/core.c > @@ -1926,7 +1926,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 7a75e15..e9efcd6 100644 > --- a/hw/scsi-disk.c > +++ b/hw/scsi-disk.c > @@ -926,7 +926,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 e4f9906..854739d 100644 > --- a/hw/virtio-blk.c > +++ b/hw/virtio-blk.c > @@ -589,7 +589,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; > > -- > 1.7.6.5 > >