From 217e9fdcadb1dc7462f4d92866314f626426fa82 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 10 Feb 2015 10:25:44 -0700 Subject: 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 Signed-off-by: Alex Williamson --- include/hw/vfio/vfio-common.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include') diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h index 1d5bfe8fcb..5f3679b7b2 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 { -- cgit v1.2.3-55-g7522