VFIO fixes:
- Fix wrong initializer (Chen Fan) - Add missing object_unparent (Alex Williamson) -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJU0mm0AAoJECObm247sIsiLK0P/04mGed8J/iPWW9KXXDPc0Nm ewHSo1Q3LBp3aDPqy7pXBD2PdFm1QI3KmyZI6A+Z/LqCUeq66u3EnxZ48nlwNw3i XyEIAUfWOiVJPOLMt+4aLQc4cRH7XO507lR/P3usuWAl6ZxEePNrba7cXKmDEsQk nd2Wn6lxYeQlRG1yqO5lM9PApOHrFHnjGFt2o1z1fi++rSvT+gv3KhavnKsM+uIP QVzTwmQtwQrLaYnJpFhZpLUO8gP0kxVCdtwUG+DAOajyPOQn/zsdg6nR332TLBcP BYaRYebKtMKyay8+1spyNkMV8f1/H1cE7fo3OzuDYFORHFDXPMONDnAjRA7dJ1M6 +BS5+rhEUuop782RN1mt5WNEr7S0o0oG5qLW+exph6nWW9OS73CUdujnDHhWy+Ot 8Gd7sjHAK4GigS1IWUnXfNcUFo1PTwVBXq9gtHRctPVDFkGNIFPhEXZEeoCpEPPx Bz/IPm4TXHmHgwWdC17IOem7uBfBRnK9oPUnKKMCTdTTpxAxk7mqfRw/118DvUrE xvxcTHGzewXAlobOa1wKfVOs7qCEbW5fPJMpanf3pSZWpb5EOrEwNw91T3iXqMN5 VJq27sgbkWAiCwCmB3CF/5yJGxnJNyUsVjUKfbAR3BRN+P1ACVmNcxHF9/Dbigab VxBSjYRhM33lpdiuo7cQ =DPXs -----END PGP SIGNATURE----- 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>
This commit is contained in:
commit
32193cb421
|
@ -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);
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue