From: "Cédric Le Goater" <clg@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Alex Williamson" <alex.williamson@redhat.com>,
"Mark Cave-Ayland" <mark.caveayland@nutanix.com>,
"Cédric Le Goater" <clg@redhat.com>
Subject: [PULL 11/29] vfio/spapr.c: use QOM casts where appropriate
Date: Fri, 26 Sep 2025 07:33:40 +0200 [thread overview]
Message-ID: <20250926053358.308198-12-clg@redhat.com> (raw)
In-Reply-To: <20250926053358.308198-1-clg@redhat.com>
From: Mark Cave-Ayland <mark.caveayland@nutanix.com>
Use QOM casts to convert between VFIOSpaprContainer and VFIOLegacyContainer
instead of accessing bcontainer directly.
Signed-off-by: Mark Cave-Ayland <mark.caveayland@nutanix.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Link: https://lore.kernel.org/qemu-devel/20250925113159.1760317-11-mark.caveayland@nutanix.com
Signed-off-by: Cédric Le Goater <clg@redhat.com>
---
hw/vfio/spapr.c | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/hw/vfio/spapr.c b/hw/vfio/spapr.c
index acaa9c141916f127a87440d239facf285f9e34e0..c883ba6da9e984f392a8d75adfb0fb8c74027d08 100644
--- a/hw/vfio/spapr.c
+++ b/hw/vfio/spapr.c
@@ -61,7 +61,7 @@ static void vfio_prereg_listener_region_add(MemoryListener *listener,
{
VFIOSpaprContainer *scontainer = container_of(listener, VFIOSpaprContainer,
prereg_listener);
- VFIOLegacyContainer *container = &scontainer->container;
+ VFIOLegacyContainer *container = VFIO_IOMMU_LEGACY(scontainer);
VFIOContainer *bcontainer = VFIO_IOMMU(container);
const hwaddr gpa = section->offset_within_address_space;
hwaddr end;
@@ -121,7 +121,7 @@ static void vfio_prereg_listener_region_del(MemoryListener *listener,
{
VFIOSpaprContainer *scontainer = container_of(listener, VFIOSpaprContainer,
prereg_listener);
- VFIOLegacyContainer *container = &scontainer->container;
+ VFIOLegacyContainer *container = VFIO_IOMMU_LEGACY(scontainer);
const hwaddr gpa = section->offset_within_address_space;
hwaddr end;
int ret;
@@ -245,8 +245,7 @@ static bool vfio_spapr_create_window(VFIOLegacyContainer *container,
{
int ret = 0;
VFIOContainer *bcontainer = VFIO_IOMMU(container);
- VFIOSpaprContainer *scontainer = container_of(container, VFIOSpaprContainer,
- container);
+ VFIOSpaprContainer *scontainer = VFIO_IOMMU_SPAPR(bcontainer);
IOMMUMemoryRegion *iommu_mr = IOMMU_MEMORY_REGION(section->mr);
uint64_t pagesize = memory_region_iommu_get_min_page_size(iommu_mr), pgmask;
unsigned entries, bits_total, bits_per_level, max_levels, ddw_levels;
@@ -353,8 +352,7 @@ vfio_spapr_container_add_section_window(VFIOContainer *bcontainer,
Error **errp)
{
VFIOLegacyContainer *container = VFIO_IOMMU_LEGACY(bcontainer);
- VFIOSpaprContainer *scontainer = container_of(container, VFIOSpaprContainer,
- container);
+ VFIOSpaprContainer *scontainer = VFIO_IOMMU_SPAPR(container);
VFIOHostDMAWindow *hostwin;
hwaddr pgsize = 0;
int ret;
@@ -443,8 +441,7 @@ vfio_spapr_container_del_section_window(VFIOContainer *bcontainer,
MemoryRegionSection *section)
{
VFIOLegacyContainer *container = VFIO_IOMMU_LEGACY(bcontainer);
- VFIOSpaprContainer *scontainer = container_of(container, VFIOSpaprContainer,
- container);
+ VFIOSpaprContainer *scontainer = VFIO_IOMMU_SPAPR(container);
if (container->iommu_type != VFIO_SPAPR_TCE_v2_IOMMU) {
return;
@@ -464,8 +461,7 @@ vfio_spapr_container_del_section_window(VFIOContainer *bcontainer,
static void vfio_spapr_container_release(VFIOContainer *bcontainer)
{
VFIOLegacyContainer *container = VFIO_IOMMU_LEGACY(bcontainer);
- VFIOSpaprContainer *scontainer = container_of(container, VFIOSpaprContainer,
- container);
+ VFIOSpaprContainer *scontainer = VFIO_IOMMU_SPAPR(container);
VFIOHostDMAWindow *hostwin, *next;
if (container->iommu_type == VFIO_SPAPR_TCE_v2_IOMMU) {
@@ -482,8 +478,7 @@ static bool vfio_spapr_container_setup(VFIOContainer *bcontainer,
Error **errp)
{
VFIOLegacyContainer *container = VFIO_IOMMU_LEGACY(bcontainer);
- VFIOSpaprContainer *scontainer = container_of(container, VFIOSpaprContainer,
- container);
+ VFIOSpaprContainer *scontainer = VFIO_IOMMU_SPAPR(container);
struct vfio_iommu_spapr_tce_info info;
bool v2 = container->iommu_type == VFIO_SPAPR_TCE_v2_IOMMU;
int ret, fd = container->fd;
--
2.51.0
next prev parent reply other threads:[~2025-09-26 5:37 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-26 5:33 [PULL 00/29] vfio queue Cédric Le Goater
2025-09-26 5:33 ` [PULL 01/29] tests/functional: add a vfio-user smoke test Cédric Le Goater
2025-09-26 5:33 ` [PULL 02/29] include/hw/vfio/vfio-container.h: rename VFIOContainer to VFIOLegacyContainer Cédric Le Goater
2025-09-26 5:33 ` [PULL 03/29] include/hw/vfio/vfio-container-base.h: rename VFIOContainerBase to VFIOContainer Cédric Le Goater
2025-09-26 5:33 ` [PULL 04/29] include/hw/vfio/vfio-container.h: rename file to vfio-container-legacy.h Cédric Le Goater
2025-09-26 5:33 ` [PULL 05/29] include/hw/vfio/vfio-container-base.h: rename file to vfio-container.h Cédric Le Goater
2025-09-26 5:33 ` [PULL 06/29] hw/vfio/container.c: rename file to container-legacy.c Cédric Le Goater
2025-09-26 5:33 ` [PULL 07/29] hw/vfio/container-base.c: rename file to container.c Cédric Le Goater
2025-09-26 5:33 ` [PULL 08/29] vfio/iommufd.c: use QOM casts where appropriate Cédric Le Goater
2025-09-26 5:33 ` [PULL 09/29] vfio/cpr-iommufd.c: " Cédric Le Goater
2025-09-26 5:33 ` [PULL 10/29] vfio/vfio-iommufd.h: rename VFIOContainer bcontainer field to parent_obj Cédric Le Goater
2025-09-26 5:33 ` Cédric Le Goater [this message]
2025-09-26 5:33 ` [PULL 12/29] vfio/spapr.c: " Cédric Le Goater
2025-09-26 5:33 ` [PULL 13/29] vfio/pci.c: rename vfio_instance_init() to vfio_pci_init() Cédric Le Goater
2025-09-26 5:33 ` [PULL 14/29] vfio/pci.c: rename vfio_instance_finalize() to vfio_pci_finalize() Cédric Le Goater
2025-09-26 5:33 ` [PULL 15/29] vfio/pci.c: rename vfio_pci_dev_class_init() to vfio_pci_class_init() Cédric Le Goater
2025-09-26 5:33 ` [PULL 16/29] vfio/pci.c: rename vfio_pci_dev_info to vfio_pci_info Cédric Le Goater
2025-09-26 5:33 ` [PULL 17/29] hw/vfio/types.h: rename TYPE_VFIO_PCI_BASE to TYPE_VFIO_PCI_DEVICE Cédric Le Goater
2025-09-26 5:33 ` [PULL 18/29] vfio/pci.c: rename vfio_pci_base_dev_class_init() to vfio_pci_device_class_init() Cédric Le Goater
2025-09-26 5:33 ` [PULL 19/29] vfio/pci.c: rename vfio_pci_base_dev_info to vfio_pci_device_info Cédric Le Goater
2025-09-26 5:33 ` [PULL 20/29] vfio/pci.c: rename vfio_pci_dev_properties[] to vfio_pci_properties[] Cédric Le Goater
2025-09-26 5:33 ` [PULL 21/29] vfio/pci.c: rename vfio_pci_dev_nohotplug_properties[] to vfio_pci_nohotplug_properties[] Cédric Le Goater
2025-09-26 5:33 ` [PULL 22/29] vfio/pci.c: rename vfio_pci_nohotplug_dev_class_init() to vfio_pci_nohotplug_class_init() Cédric Le Goater
2025-09-26 5:33 ` [PULL 23/29] vfio/pci.c: rename vfio_pci_nohotplug_dev_info to vfio_pci_nohotplug_info Cédric Le Goater
2025-09-26 5:33 ` [PULL 24/29] vfio-user/pci.c: rename vfio_user_pci_dev_class_init() to vfio_user_pci_class_init() Cédric Le Goater
2025-09-26 5:33 ` [PULL 25/29] vfio-user/pci.c: rename vfio_user_pci_dev_properties[] to vfio_user_pci_properties[] Cédric Le Goater
2025-09-26 5:33 ` [PULL 26/29] vfio-user/pci.c: rename vfio_user_instance_init() to vfio_user_pci_init() Cédric Le Goater
2025-09-26 5:33 ` [PULL 27/29] vfio-user/pci.c: rename vfio_user_instance_finalize() to vfio_user_pci_finalize() Cédric Le Goater
2025-09-26 5:33 ` [PULL 28/29] vfio-user/pci.c: rename vfio_user_pci_dev_info to vfio_user_pci_info Cédric Le Goater
2025-09-26 5:33 ` [PULL 29/29] include/hw/vfio/vfio-device.h: fix include header guard name Cédric Le Goater
2025-09-27 15:41 ` [PULL 00/29] 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=20250926053358.308198-12-clg@redhat.com \
--to=clg@redhat.com \
--cc=alex.williamson@redhat.com \
--cc=mark.caveayland@nutanix.com \
--cc=qemu-devel@nongnu.org \
/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).