Commit 32193cb4 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20150204.0' into staging 



VFIO fixes:
- Fix wrong initializer (Chen Fan)
- Add missing object_unparent (Alex Williamson)

# gpg: Signature made Wed 04 Feb 2015 18:49:24 GMT using RSA key ID 3BB08B22
# gpg: Good signature from "Alex Williamson <alex.williamson@redhat.com>"
# gpg:                 aka "Alex Williamson <alex@shazbot.org>"
# gpg:                 aka "Alex Williamson <alwillia@redhat.com>"
# gpg:                 aka "Alex Williamson <alex.l.williamson@gmail.com>"

* remotes/awilliam/tags/vfio-update-20150204.0:
  vfio-pci: Fix missing unparent of dynamically allocated MemoryRegion
  vfio: fix wrong initialize vfio_group_list

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents ec6f25e7 3a4dbe6a

hw/vfio/common.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#include "trace.h"



struct vfio_group_head vfio_group_list =

    QLIST_HEAD_INITIALIZER(vfio_address_spaces);

    QLIST_HEAD_INITIALIZER(vfio_group_list);

struct vfio_as_head vfio_address_spaces =

    QLIST_HEAD_INITIALIZER(vfio_address_spaces);

hw/vfio/pci.c

+1 −0
Original line number Diff line number Diff line
@@ -3065,6 +3065,7 @@ static void vfio_put_device(VFIOPCIDevice *vdev) 
{

    g_free(vdev->vbasedev.name);

    if (vdev->msix) {

        object_unparent(OBJECT(&vdev->msix->mmap_mem));

        g_free(vdev->msix);

        vdev->msix = NULL;

    }