From: Peter Maydell Date: Thu, 5 Feb 2015 10:19:38 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20150204.0' into... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=32193cb421cecb98b48715e0740b2d948cda0779;p=qemu.git 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 " # gpg: aka "Alex Williamson " # gpg: aka "Alex Williamson " # gpg: aka "Alex Williamson " * 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 --- 32193cb421cecb98b48715e0740b2d948cda0779