Commit d288eef3 authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Gerd Hoffmann
Browse files

libvhost-user: fix -Waddress-of-packed-member 



/home/elmarco/src/qemu/contrib/libvhost-user/libvhost-user.c: In function ‘vu_set_mem_table_exec_postcopy’:
/home/elmarco/src/qemu/contrib/libvhost-user/libvhost-user.c:546:31: warning: taking address of packed member of ‘struct VhostUserMsg’ may result in an unaligned pointer value [-Waddress-of-packed-member]
  546 |     VhostUserMemory *memory = &vmsg->payload.memory;
      |                               ^~~~~~~~~~~~~~~~~~~~~
/home/elmarco/src/qemu/contrib/libvhost-user/libvhost-user.c: In function ‘vu_set_mem_table_exec’:
/home/elmarco/src/qemu/contrib/libvhost-user/libvhost-user.c:688:31: warning: taking address of packed member of ‘struct VhostUserMsg’ may result in an unaligned pointer value [-Waddress-of-packed-member]
  688 |     VhostUserMemory *memory = &vmsg->payload.memory;
      |                               ^~~~~~~~~~~~~~~~~~~~~
/home/elmarco/src/qemu/contrib/libvhost-user/libvhost-user.c: In function ‘vu_set_vring_addr_exec’:
/home/elmarco/src/qemu/contrib/libvhost-user/libvhost-user.c:817:36: warning: taking address of packed member of ‘struct VhostUserMsg’ may result in an unaligned pointer value [-Waddress-of-packed-member]
  817 |     struct vhost_vring_addr *vra = &vmsg->payload.addr;
      |                                    ^~~~~~~~~~~~~~~~~~~

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Message-id: 20190503130034.24916-2-marcandre.lureau@redhat.com
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 812b835f

contrib/libvhost-user/libvhost-user.c

+3 −3
Original line number Diff line number Diff line
@@ -542,7 +542,7 @@ static bool 
vu_set_mem_table_exec_postcopy(VuDev *dev, VhostUserMsg *vmsg)

{

    int i;

    VhostUserMemory *memory = &vmsg->payload.memory;

    VhostUserMemory m = vmsg->payload.memory, *memory = &m;

    dev->nregions = memory->nregions;



    DPRINT("Nregions: %d\n", memory->nregions);
@@ -684,7 +684,7 @@ static bool 
vu_set_mem_table_exec(VuDev *dev, VhostUserMsg *vmsg)

{

    int i;

    VhostUserMemory *memory = &vmsg->payload.memory;

    VhostUserMemory m = vmsg->payload.memory, *memory = &m;



    for (i = 0; i < dev->nregions; i++) {

        VuDevRegion *r = &dev->regions[i];
@@ -813,7 +813,7 @@ vu_set_vring_num_exec(VuDev *dev, VhostUserMsg *vmsg) 
static bool

vu_set_vring_addr_exec(VuDev *dev, VhostUserMsg *vmsg)

{

    struct vhost_vring_addr *vra = &vmsg->payload.addr;

    struct vhost_vring_addr addr = vmsg->payload.addr, *vra = &addr;

    unsigned int index = vra->index;

    VuVirtq *vq = &dev->vq[index];