diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-02-05 10:19:38 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-02-05 10:19:38 +0000 |
| commit | 32193cb421cecb98b48715e0740b2d948cda0779 (patch) | |
| tree | 1f48da04443a91ab6bb8b7d818a1b63cf1065956 | |
| parent | ec6f25e788ef57ce1e9f734984ef8885172fd9e2 (diff) | |
| parent | 3a4dbe6aa934370a92372528c1255ee1504965ee (diff) | |
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: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/vfio/common.c | 2 | ||||
| -rw-r--r-- | hw/vfio/pci.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/hw/vfio/common.c b/hw/vfio/common.c index cf483fffa9..e71385e4fe 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -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); diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index 014a92ce5f..29caabc149 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -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; } |