From: "Cédric Le Goater" <clg@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Eric Auger" <eric.auger@redhat.com>,
"Zhenzhong Duan" <zhenzhong.duan@intel.com>,
"Alex Williamson" <alex.williamson@redhat.com>,
"Cédric Le Goater" <clg@redhat.com>
Subject: [PATCH v2 09/17] vfio/container: Introduce vfio_create_container()
Date: Mon, 17 Jun 2024 08:34:01 +0200 [thread overview]
Message-ID: <20240617063409.34393-10-clg@redhat.com> (raw)
In-Reply-To: <20240617063409.34393-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.
Signed-off-by: Cédric Le Goater <clg@redhat.com>
Reviewed-by: Zhenzhong Duan <zhenzhong.duan@intel.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-17 6:36 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-17 6:33 [PATCH v2 00/17] vfio: QOMify VFIOContainer Cédric Le Goater
2024-06-17 6:33 ` [PATCH v2 01/17] vfio: Make vfio_devices_dma_logging_start() return bool Cédric Le Goater
2024-06-17 11:31 ` Eric Auger
2024-06-17 12:34 ` Cédric Le Goater
2024-06-17 13:55 ` Eric Auger
2024-06-17 6:33 ` [PATCH v2 02/17] vfio: Remove unused declarations from vfio-common.h Cédric Le Goater
2024-06-17 11:32 ` Eric Auger
2024-06-17 6:33 ` [PATCH v2 03/17] vfio/common: Move dirty tracking ranges update to helper Cédric Le Goater
2024-06-17 11:39 ` Eric Auger
2024-06-18 11:22 ` Cédric Le Goater
2024-06-17 6:33 ` [PATCH v2 04/17] vfio/common: Extract vIOMMU code from vfio_sync_dirty_bitmap() Cédric Le Goater
2024-06-17 14:00 ` Eric Auger
2024-06-18 11:22 ` Cédric Le Goater
2024-06-17 6:33 ` [PATCH v2 05/17] vfio/container: Introduce vfio_address_space_insert() Cédric Le Goater
2024-06-17 14:04 ` Eric Auger
2024-06-18 11:27 ` Cédric Le Goater
2024-06-17 6:33 ` [PATCH v2 06/17] vfio/container: Simplify vfio_container_init() Cédric Le Goater
2024-06-17 14:25 ` Eric Auger
2024-06-18 11:29 ` Cédric Le Goater
2024-06-17 6:33 ` [PATCH v2 07/17] vfio/container: Modify vfio_get_iommu_type() to use a container fd Cédric Le Goater
2024-06-17 14:26 ` Eric Auger
2024-06-17 6:34 ` [PATCH v2 08/17] vfio/container: Introduce vfio_get_iommu_class_name() Cédric Le Goater
2024-06-17 14:29 ` Eric Auger
2024-06-17 6:34 ` Cédric Le Goater [this message]
2024-06-17 14:29 ` [PATCH v2 09/17] vfio/container: Introduce vfio_create_container() Eric Auger
2024-06-17 6:34 ` [PATCH v2 10/17] vfio/container: Discover IOMMU type before creating the container Cédric Le Goater
2024-06-17 14:39 ` Eric Auger
2024-06-17 6:34 ` [PATCH v2 11/17] vfio/container: Change VFIOContainerBase to use QOM Cédric Le Goater
2024-06-17 15:26 ` Eric Auger
2024-06-17 6:34 ` [PATCH v2 12/17] vfio/container: Switch to QOM Cédric Le Goater
2024-06-17 15:26 ` Eric Auger
2024-06-17 6:34 ` [PATCH v2 13/17] vfio/container: Introduce an instance_init() handler Cédric Le Goater
2024-06-17 15:27 ` Eric Auger
2024-06-17 6:34 ` [PATCH v2 14/17] vfio/container: Remove VFIOContainerBase::ops Cédric Le Goater
2024-06-17 15:27 ` Eric Auger
2024-06-17 6:34 ` [PATCH v2 15/17] vfio/container: Remove vfio_container_init() Cédric Le Goater
2024-06-17 15:28 ` Eric Auger
2024-06-17 6:34 ` [PATCH v2 16/17] vfio/container: Introduce vfio_iommu_legacy_instance_init() Cédric Le Goater
2024-06-17 15:29 ` Eric Auger
2024-06-17 6:34 ` [PATCH v2 17/17] vfio/container: Move vfio_container_destroy() to an instance_finalize() handler Cédric Le Goater
2024-06-17 10:24 ` Duan, Zhenzhong
2024-06-17 15:30 ` Eric Auger
2024-06-17 16:22 ` [PATCH v2 00/17] vfio: QOMify VFIOContainer Eric Auger
2024-06-18 11:45 ` Cédric Le Goater
2024-06-24 21:17 ` Cédric Le Goater
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=20240617063409.34393-10-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).