diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2015-02-10 10:25:44 -0700 |
|---|---|---|
| committer | Alex Williamson <alex.williamson@redhat.com> | 2015-02-10 10:25:44 -0700 |
| commit | 217e9fdcadb1dc7462f4d92866314f626426fa82 (patch) | |
| tree | 20fa3fe01342fca506d75578f8383298577264a9 /include | |
| parent | 6e48e8f9e0f5b6b15c41f6f8a68c9bf330147d45 (diff) | |
| download | qemu-217e9fdcadb1dc7462f4d92866314f626426fa82.zip qemu-217e9fdcadb1dc7462f4d92866314f626426fa82.tar.gz qemu-217e9fdcadb1dc7462f4d92866314f626426fa82.tar.bz2 | |
vfio: cleanup vfio_get_device error path, remove vfio_populate_device callback
Now that vfio_put_base_device is called unconditionally at instance_finalize
time, it can be called twice if vfio_populate_device fails. This works
but it is slightly harder to follow.
Change vfio_get_device to not touch the vbasedev struct until it will
definitely succeed, moving the vfio_populate_device call back to vfio-pci.
This way, vfio_put_base_device will only be called once.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/vfio/vfio-common.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h index 1d5bfe8..5f3679b 100644 --- a/include/hw/vfio/vfio-common.h +++ b/include/hw/vfio/vfio-common.h @@ -112,7 +112,6 @@ struct VFIODeviceOps { void (*vfio_compute_needs_reset)(VFIODevice *vdev); int (*vfio_hot_reset_multi)(VFIODevice *vdev); void (*vfio_eoi)(VFIODevice *vdev); - int (*vfio_populate_device)(VFIODevice *vdev); }; typedef struct VFIOGroup { |