Commit 5504bba1 authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Jason Wang
Browse files

vmxnet3: Convert ring values to uint32_t's 



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: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Acked-by: default avatarDmitry Fleytman <dmitry@daynix.com>
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
parent 727c2d76

hw/net/vmxnet3.c

+6 −6
Original line number Diff line number Diff line
@@ -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)