Re: [Qemu-devel] [PATCH 1/2] vmxnet3: Convert ring values to uint32_t's

[Dmitry Fleytman]

Acked-by: Dmitry Fleytman <address@hidden>

> On 15 Dec 2016, at 22:05 PM, Dr. David Alan Gilbert (git) <address@hidden> 
> wrote:
> 
> From: "Dr. David Alan Gilbert" <address@hidden>
> 
> The index's in the Vmxnet3Ring were migrated as 32bit ints
> yet are declared as size_t's.  They appear to be derived
> from 32bit values loaded from guest memory, so actually
> store them as that.
> 
> Signed-off-by: Dr. David Alan Gilbert <address@hidden>
> ---
> hw/net/vmxnet3.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c
> index 2cb2731..7853174 100644
> --- a/hw/net/vmxnet3.c
> +++ b/hw/net/vmxnet3.c
> @@ -141,17 +141,17 @@ typedef struct VMXNET3Class {
> /* Cyclic ring abstraction */
> typedef struct {
>     hwaddr pa;
> -    size_t size;
> -    size_t cell_size;
> -    size_t next;
> +    uint32_t size;
> +    uint32_t cell_size;
> +    uint32_t next;
>     uint8_t gen;
> } Vmxnet3Ring;
> 
> static inline void vmxnet3_ring_init(PCIDevice *d,
>                                    Vmxnet3Ring *ring,
>                                      hwaddr pa,
> -                                     size_t size,
> -                                     size_t cell_size,
> +                                     uint32_t size,
> +                                     uint32_t cell_size,
>                                      bool zero_region)
> {
>     ring->pa = pa;
> @@ -166,7 +166,7 @@ static inline void vmxnet3_ring_init(PCIDevice *d,
> }
> 
> #define VMXNET3_RING_DUMP(macro, ring_name, ridx, r)                         \
> -    macro("%s#%d: base %" PRIx64 " size %zu cell_size %zu gen %d next %zu",  
> \
> +    macro("%s#%d: base %" PRIx64 " size %u cell_size %u gen %d next %u",  \
>           (ring_name), (ridx),                                               \
>           (r)->pa, (r)->size, (r)->cell_size, (r)->gen, (r)->next)
> 
> -- 
> 2.9.3
>