summary refs log tree commit diff stats
path: root/hw/vfio/common.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-02-05 10:19:38 +0000
committerPeter Maydell <peter.maydell@linaro.org>2015-02-05 10:19:38 +0000
commit32193cb421cecb98b48715e0740b2d948cda0779 (patch)
tree1f48da04443a91ab6bb8b7d818a1b63cf1065956 /hw/vfio/common.c
parentec6f25e788ef57ce1e9f734984ef8885172fd9e2 (diff)
parent3a4dbe6aa934370a92372528c1255ee1504965ee (diff)
downloadfocaccia-qemu-32193cb421cecb98b48715e0740b2d948cda0779.tar.gz
focaccia-qemu-32193cb421cecb98b48715e0740b2d948cda0779.zip
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>
Diffstat (limited to 'hw/vfio/common.c')
-rw-r--r--hw/vfio/common.c2
1 files changed, 1 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);