On Fri 09 Feb 2018 10:53:12 AM CET, Piotr Sarna wrote:
> BlockSizes structure used in block size probing has uint32_t types
> for logical and physical sizes. These fields are wrongfully assigned
> to uint16_t in BlockConf, which results, among other errors,
> in assigning 0 instead of 65536 (which will be the case in at least
> future LizardFS block device driver among other things).
>
> This commit makes BlockConf's physical_block_size and logical_block_size
> fields uint32_t to avoid inconsistencies.
>
> Signed-off-by: Piotr Sarna <sa...@skytechnology.pl>
> ---
> hw/core/qdev-properties.c | 10 +++++-----
> include/hw/block/block.h | 4 ++--
> include/hw/qdev-properties.h | 2 +-
> 3 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
> index 5bbc2d9..1400ba5 100644
> --- a/hw/core/qdev-properties.c
> +++ b/hw/core/qdev-properties.c
> @@ -731,14 +731,14 @@ static void set_blocksize(Object *obj, Visitor *v,
> const char *name,
> uint16_t value, *ptr = qdev_get_prop_ptr(dev, prop);
> Error *local_err = NULL;
> const int64_t min = 512;
> - const int64_t max = 32768;
> + const int64_t max = 2147483648;
>
> if (dev->realized) {
> qdev_prop_set_after_realize(dev, name, errp);
> return;
> }
>
> - visit_type_uint16(v, name, &value, &local_err);
> + visit_type_uint32(v, name, &value, &local_err);
I'm not familiar with this code so apologies if there's something that I
have overlooked, but it catches my attention that
a) you're using 2147483648 as an upper limit, that's INT32_MAX + 1.
Where does that value come from? It's certainly not the highest
value that a uint32_t can hold, and it doesn't fit in an int32_t
either.
b) you're using visit_type_uint32() but the 'value' you're passing is
a uint16_t (also *ptr later in the same function).
Berto
