From: "Cédric Le Goater" <clg@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Alex Williamson" <alex.williamson@redhat.com>,
"Cédric Le Goater" <clg@redhat.com>,
"Zhenzhong Duan" <zhenzhong.duan@intel.com>,
"Eric Auger" <eric.auger@redhat.com>
Subject: [PULL 34/42] vfio/container: Introduce vfio_create_container()
Date: Mon, 24 Jun 2024 23:24:48 +0200 [thread overview]
Message-ID: <20240624212456.350919-35-clg@redhat.com> (raw)
In-Reply-To: <20240624212456.350919-1-clg@redhat.com>
This routine allocates the QEMU struct type representing the VFIO
container. It is minimal currently and future changes will do more
initialization.
Reviewed-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Tested-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Cédric Le Goater <clg@redhat.com>
---
hw/vfio/container.c | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/hw/vfio/container.c b/hw/vfio/container.c
index bb6abe60ee29d5b69b494523c9002f53e1b2a3c8..a8691942791006f44f7a3c34b32c67ca51766182 100644
--- a/hw/vfio/container.c
+++ b/hw/vfio/container.c
@@ -430,6 +430,16 @@ static bool vfio_set_iommu(VFIOContainer *container, int group_fd,
return true;
}
+static VFIOContainer *vfio_create_container(int fd, VFIOGroup *group,
+ Error **errp)
+{
+ VFIOContainer *container;
+
+ container = g_malloc0(sizeof(*container));
+ container->fd = fd;
+ return container;
+}
+
static int vfio_get_iommu_info(VFIOContainer *container,
struct vfio_iommu_type1_info **info)
{
@@ -604,13 +614,14 @@ static bool vfio_connect_container(VFIOGroup *group, AddressSpace *as,
goto close_fd_exit;
}
- container = g_malloc0(sizeof(*container));
- container->fd = fd;
- bcontainer = &container->bcontainer;
-
+ container = vfio_create_container(fd, group, errp);
+ if (!container) {
+ goto close_fd_exit;
+ }
if (!vfio_set_iommu(container, group->fd, errp)) {
goto free_container_exit;
}
+ bcontainer = &container->bcontainer;
if (!vfio_cpr_register_container(bcontainer, errp)) {
goto free_container_exit;
--
2.45.2
next prev parent reply other threads:[~2024-06-24 21:29 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-24 21:24 [PULL 00/42] vfio queue Cédric Le Goater
2024-06-24 21:24 ` [PULL 01/42] backends: Introduce HostIOMMUDevice abstract Cédric Le Goater
2024-06-24 21:24 ` [PULL 02/42] backends/host_iommu_device: Introduce HostIOMMUDeviceCaps Cédric Le Goater
2024-06-24 21:24 ` [PULL 03/42] vfio/container: Introduce TYPE_HOST_IOMMU_DEVICE_LEGACY_VFIO device Cédric Le Goater
2024-06-24 21:24 ` [PULL 04/42] backends/iommufd: Introduce TYPE_HOST_IOMMU_DEVICE_IOMMUFD[_VFIO] devices Cédric Le Goater
2024-06-24 21:24 ` [PULL 05/42] range: Introduce range_get_last_bit() Cédric Le Goater
2024-06-24 21:24 ` [PULL 06/42] vfio/container: Implement HostIOMMUDeviceClass::realize() handler Cédric Le Goater
2024-06-24 21:24 ` [PULL 07/42] backends/iommufd: Introduce helper function iommufd_backend_get_device_info() Cédric Le Goater
2024-06-24 21:24 ` [PULL 08/42] vfio/iommufd: Implement HostIOMMUDeviceClass::realize() handler Cédric Le Goater
2024-06-24 21:24 ` [PULL 09/42] vfio/container: Implement HostIOMMUDeviceClass::get_cap() handler Cédric Le Goater
2024-06-24 21:24 ` [PULL 10/42] backends/iommufd: " Cédric Le Goater
2024-06-24 21:24 ` [PULL 11/42] vfio: Create host IOMMU device instance Cédric Le Goater
2024-06-24 21:24 ` [PULL 12/42] hw/pci: Introduce helper function pci_device_get_iommu_bus_devfn() Cédric Le Goater
2024-06-24 21:24 ` [PULL 13/42] hw/pci: Introduce pci_device_[set|unset]_iommu_device() Cédric Le Goater
2024-06-24 21:24 ` [PULL 14/42] vfio/pci: Pass HostIOMMUDevice to vIOMMU Cédric Le Goater
2024-06-24 21:24 ` [PULL 15/42] intel_iommu: Extract out vtd_cap_init() to initialize cap/ecap Cédric Le Goater
2024-06-24 21:24 ` [PULL 16/42] intel_iommu: Implement [set|unset]_iommu_device() callbacks Cédric Le Goater
2024-06-24 21:24 ` [PULL 17/42] intel_iommu: Check compatibility with host IOMMU capabilities Cédric Le Goater
2024-06-24 21:24 ` [PULL 18/42] HostIOMMUDevice: Store the VFIO/VDPA agent Cédric Le Goater
2024-06-24 21:24 ` [PULL 19/42] virtio-iommu: Implement set|unset]_iommu_device() callbacks Cédric Le Goater
2024-06-24 21:24 ` [PULL 20/42] HostIOMMUDevice: Introduce get_iova_ranges callback Cédric Le Goater
2024-06-24 21:24 ` [PULL 21/42] HostIOMMUDevice: Store the aliased bus and devfn Cédric Le Goater
2024-06-24 21:24 ` [PULL 22/42] virtio-iommu: Compute host reserved regions Cédric Le Goater
2024-06-24 21:24 ` [PULL 23/42] virtio-iommu: Remove the implementation of iommu_set_iova_range Cédric Le Goater
2024-06-24 21:24 ` [PULL 24/42] hw/vfio: Remove memory_region_iommu_set_iova_ranges() call Cédric Le Goater
2024-06-24 21:24 ` [PULL 25/42] memory: Remove IOMMU MR iommu_set_iova_range API Cédric Le Goater
2024-06-24 21:24 ` [PULL 26/42] vfio: Make vfio_devices_dma_logging_start() return bool Cédric Le Goater
2024-06-24 21:24 ` [PULL 27/42] vfio: Remove unused declarations from vfio-common.h Cédric Le Goater
2024-06-24 21:24 ` [PULL 28/42] vfio/common: Move dirty tracking ranges update to helper Cédric Le Goater
2024-06-24 21:24 ` [PULL 29/42] vfio/common: Extract vIOMMU code from vfio_sync_dirty_bitmap() Cédric Le Goater
2024-06-24 21:24 ` [PULL 30/42] vfio/container: Introduce vfio_address_space_insert() Cédric Le Goater
2024-06-24 21:24 ` [PULL 31/42] vfio/container: Simplify vfio_container_init() Cédric Le Goater
2024-06-24 21:24 ` [PULL 32/42] vfio/container: Modify vfio_get_iommu_type() to use a container fd Cédric Le Goater
2024-06-24 21:24 ` [PULL 33/42] vfio/container: Introduce vfio_get_iommu_class_name() Cédric Le Goater
2024-06-24 21:24 ` Cédric Le Goater [this message]
2024-06-24 21:24 ` [PULL 35/42] vfio/container: Discover IOMMU type before creating the container Cédric Le Goater
2024-06-24 21:24 ` [PULL 36/42] vfio/container: Change VFIOContainerBase to use QOM Cédric Le Goater
2024-06-24 21:24 ` [PULL 37/42] vfio/container: Switch to QOM Cédric Le Goater
2024-06-24 21:24 ` [PULL 38/42] vfio/container: Introduce an instance_init() handler Cédric Le Goater
2024-06-24 21:24 ` [PULL 39/42] vfio/container: Remove VFIOContainerBase::ops Cédric Le Goater
2024-06-24 21:24 ` [PULL 40/42] vfio/container: Remove vfio_container_init() Cédric Le Goater
2024-06-24 21:24 ` [PULL 41/42] vfio/container: Introduce vfio_iommu_legacy_instance_init() Cédric Le Goater
2024-06-24 21:24 ` [PULL 42/42] vfio/container: Move vfio_container_destroy() to an instance_finalize() handler Cédric Le Goater
2024-06-25 17:25 ` [PULL 00/42] vfio queue Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240624212456.350919-35-clg@redhat.com \
--to=clg@redhat.com \
--cc=alex.williamson@redhat.com \
--cc=eric.auger@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=zhenzhong.duan@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).