[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v10 09/19] vfio: extract vfio_register_container_liste
From: |
Chen Fan |
Subject: |
[Qemu-devel] [RFC v10 09/19] vfio: extract vfio_register_container_listener from vfio_connect_container |
Date: |
Tue, 16 Jun 2015 16:10:53 +0800 |
Signed-off-by: Chen Fan <address@hidden>
---
hw/vfio/common.c | 60 ++++++++++++++++++++++++++++++++++++--------------------
1 file changed, 39 insertions(+), 21 deletions(-)
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index 67881f7..df3171d 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -631,6 +631,38 @@ static void vfio_put_address_space(VFIOAddressSpace *space)
}
}
+static int vfio_register_container_listener(VFIOContainer *container,
+ AddressSpace *as)
+{
+ int ret;
+
+ if (!as) {
+ return 0;
+ }
+
+ container->iommu_data.type1.listener = vfio_memory_listener;
+ container->iommu_data.release = vfio_listener_release;
+
+ memory_listener_register(&container->iommu_data.type1.listener,
+ as);
+
+ if (container->iommu_data.type1.error) {
+ ret = container->iommu_data.type1.error;
+ error_report("vfio: memory listener initialization failed for
container");
+ goto listener_release_exit;
+ }
+
+ container->iommu_data.type1.initialized = true;
+ container->space->as = as;
+
+ return 0;
+
+listener_release_exit:
+ vfio_listener_release(container);
+
+ return ret;
+}
+
static int vfio_connect_container(VFIOGroup *group, AddressSpace *as)
{
VFIOContainer *container;
@@ -684,20 +716,10 @@ static int vfio_connect_container(VFIOGroup *group,
AddressSpace *as)
goto free_container_exit;
}
- container->iommu_data.type1.listener = vfio_memory_listener;
- container->iommu_data.release = vfio_listener_release;
-
- memory_listener_register(&container->iommu_data.type1.listener,
- container->space->as);
-
- if (container->iommu_data.type1.error) {
- ret = container->iommu_data.type1.error;
- error_report("vfio: memory listener initialization failed for
container");
- goto listener_release_exit;
+ ret = vfio_register_container_listener(container, as);
+ if (ret) {
+ goto free_container_exit;
}
-
- container->iommu_data.type1.initialized = true;
-
} else if (ioctl(fd, VFIO_CHECK_EXTENSION, VFIO_SPAPR_TCE_IOMMU)) {
ret = ioctl(group->fd, VFIO_GROUP_SET_CONTAINER, &fd);
if (ret) {
@@ -724,12 +746,10 @@ static int vfio_connect_container(VFIOGroup *group,
AddressSpace *as)
goto free_container_exit;
}
- container->iommu_data.type1.listener = vfio_memory_listener;
- container->iommu_data.release = vfio_listener_release;
-
- memory_listener_register(&container->iommu_data.type1.listener,
- container->space->as);
-
+ ret = vfio_register_container_listener(container, as);
+ if (ret) {
+ goto free_container_exit;
+ }
} else {
error_report("vfio: No available IOMMU models");
ret = -EINVAL;
@@ -743,8 +763,6 @@ static int vfio_connect_container(VFIOGroup *group,
AddressSpace *as)
QLIST_INSERT_HEAD(&container->group_list, group, container_next);
return 0;
-listener_release_exit:
- vfio_listener_release(container);
free_container_exit:
g_free(container);
--
1.9.3
- [Qemu-devel] [RFC v10 01/19] vfio: extract vfio_get_hot_reset_info as a single function, (continued)
- [Qemu-devel] [RFC v10 01/19] vfio: extract vfio_get_hot_reset_info as a single function, Chen Fan, 2015/06/16
- [Qemu-devel] [RFC v10 03/19] pcie: modify the capability size assert, Chen Fan, 2015/06/16
- [Qemu-devel] [RFC v10 02/19] vfio: squeeze out vfio_pci_do_hot_reset for support bus reset, Chen Fan, 2015/06/16
- [Qemu-devel] [RFC v10 04/19] vfio: make the 4 bytes aligned for capability size, Chen Fan, 2015/06/16
- [Qemu-devel] [RFC v10 06/19] aer: impove pcie_aer_init to support vfio device, Chen Fan, 2015/06/16
- [Qemu-devel] [RFC v10 08/19] vfio: add ref for group to support own affected groups, Chen Fan, 2015/06/16
- [Qemu-devel] [RFC v10 05/19] vfio: add pcie extanded capability support, Chen Fan, 2015/06/16
- [Qemu-devel] [RFC v10 10/19] vfio: improve vfio_get_group to support adding as is NULL., Chen Fan, 2015/06/16
- [Qemu-devel] [RFC v10 07/19] vfio: add aer support for vfio device, Chen Fan, 2015/06/16
- [Qemu-devel] [RFC v10 09/19] vfio: extract vfio_register_container_listener from vfio_connect_container,
Chen Fan <=
- [Qemu-devel] [RFC v10 11/19] get all affected groups for each device support aer, Chen Fan, 2015/06/16
- [Qemu-devel] [RFC v10 12/19] vfio: add check host bus reset is support or not, Chen Fan, 2015/06/16
- [Qemu-devel] [RFC v10 14/19] vfio: add sec_bus_reset notifier to notify physical bus reset is needed, Chen Fan, 2015/06/16
- [Qemu-devel] [RFC v10 15/19] vfio: improve vfio_pci_hot_reset to support more case, Chen Fan, 2015/06/16
- [Qemu-devel] [RFC v10 16/19] vfio: do hot bus reset when do virtual secondary bus reset, Chen Fan, 2015/06/16
- [Qemu-devel] [RFC v10 17/19] pcie_aer: expose pcie_aer_msg() interface, Chen Fan, 2015/06/16
- [Qemu-devel] [RFC v10 18/19] vfio-pci: pass the aer error to guest, Chen Fan, 2015/06/16
- [Qemu-devel] [RFC v10 13/19] pci: add bus reset_notifiers callbacks for host bus reset, Chen Fan, 2015/06/16