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 05/29] include/hw/vfio/vfio-container-base.h: rename file to vfio-container.h
Date: Fri, 26 Sep 2025 07:33:34 +0200 [thread overview]
Message-ID: <20250926053358.308198-6-clg@redhat.com> (raw)
In-Reply-To: <20250926053358.308198-1-clg@redhat.com>
From: Mark Cave-Ayland <mark.caveayland@nutanix.com>
With the rename of VFIOContainerBase to VFIOContainer, the vfio-container-base.h
header file containing the struct definition is misleading. Rename it from
vfio-container-base.h to vfio-container.h accordingly, fixing up the name
of the include guard at the same time.
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-5-mark.caveayland@nutanix.com
Signed-off-by: Cédric Le Goater <clg@redhat.com>
---
hw/vfio-user/container.h | 2 +-
hw/vfio/vfio-iommufd.h | 2 +-
include/hw/vfio/vfio-container-legacy.h | 2 +-
include/hw/vfio/{vfio-container-base.h => vfio-container.h} | 6 +++---
include/hw/vfio/vfio-device.h | 2 +-
hw/vfio/container-base.c | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
rename include/hw/vfio/{vfio-container-base.h => vfio-container.h} (98%)
diff --git a/hw/vfio-user/container.h b/hw/vfio-user/container.h
index 241863ef976f5a437755358c3949dd02f7820726..a2b42e3169dfba173308cb69404fc3b0fa98e99a 100644
--- a/hw/vfio-user/container.h
+++ b/hw/vfio-user/container.h
@@ -9,7 +9,7 @@
#include "qemu/osdep.h"
-#include "hw/vfio/vfio-container-base.h"
+#include "hw/vfio/vfio-container.h"
#include "hw/vfio-user/proxy.h"
/* MMU container sub-class for vfio-user. */
diff --git a/hw/vfio/vfio-iommufd.h b/hw/vfio/vfio-iommufd.h
index 6c049d925763848b25b25cea632cf9d1874f83e9..13f412aad79abfea2e591ee0e3e6d7a5b2c9f68c 100644
--- a/hw/vfio/vfio-iommufd.h
+++ b/hw/vfio/vfio-iommufd.h
@@ -9,7 +9,7 @@
#ifndef HW_VFIO_VFIO_IOMMUFD_H
#define HW_VFIO_VFIO_IOMMUFD_H
-#include "hw/vfio/vfio-container-base.h"
+#include "hw/vfio/vfio-container.h"
typedef struct VFIODevice VFIODevice;
diff --git a/include/hw/vfio/vfio-container-legacy.h b/include/hw/vfio/vfio-container-legacy.h
index ab5130d26eaa0e9fe586e49efe78aef6c0450540..74a72df018b50490b95d80044a31247ba7c9fc3b 100644
--- a/include/hw/vfio/vfio-container-legacy.h
+++ b/include/hw/vfio/vfio-container-legacy.h
@@ -9,7 +9,7 @@
#ifndef HW_VFIO_CONTAINER_LEGACY_H
#define HW_VFIO_CONTAINER_LEGACY_H
-#include "hw/vfio/vfio-container-base.h"
+#include "hw/vfio/vfio-container.h"
#include "hw/vfio/vfio-cpr.h"
typedef struct VFIOLegacyContainer VFIOLegacyContainer;
diff --git a/include/hw/vfio/vfio-container-base.h b/include/hw/vfio/vfio-container.h
similarity index 98%
rename from include/hw/vfio/vfio-container-base.h
rename to include/hw/vfio/vfio-container.h
index b580f4a02df92276ef82c953eaf6942e1bf31413..b8fb2b8b5d72b1d2a4c00dc89b214b48a371f555 100644
--- a/include/hw/vfio/vfio-container-base.h
+++ b/include/hw/vfio/vfio-container.h
@@ -10,8 +10,8 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*/
-#ifndef HW_VFIO_VFIO_CONTAINER_BASE_H
-#define HW_VFIO_VFIO_CONTAINER_BASE_H
+#ifndef HW_VFIO_VFIO_CONTAINER_H
+#define HW_VFIO_VFIO_CONTAINER_H
#include "system/memory.h"
@@ -276,4 +276,4 @@ VFIORamDiscardListener *vfio_find_ram_discard_listener(
void vfio_container_region_add(VFIOContainer *bcontainer,
MemoryRegionSection *section, bool cpr_remap);
-#endif /* HW_VFIO_VFIO_CONTAINER_BASE_H */
+#endif /* HW_VFIO_VFIO_CONTAINER_H */
diff --git a/include/hw/vfio/vfio-device.h b/include/hw/vfio/vfio-device.h
index 67b9fcdd2c011234d250bcdd23fdcdfb259aba2f..ed19e2e1e5859a0e9d3910d54d6ba2ad61f551d9 100644
--- a/include/hw/vfio/vfio-device.h
+++ b/include/hw/vfio/vfio-device.h
@@ -27,7 +27,7 @@
#include <linux/vfio.h>
#endif
#include "system/system.h"
-#include "hw/vfio/vfio-container-base.h"
+#include "hw/vfio/vfio-container.h"
#include "hw/vfio/vfio-cpr.h"
#include "system/host_iommu_device.h"
#include "system/iommufd.h"
diff --git a/hw/vfio/container-base.c b/hw/vfio/container-base.c
index 98c5198e5043b0ecb679060116bbac240ac76747..250b20f424522f4b6a4e864906eed2d8d13efbcd 100644
--- a/hw/vfio/container-base.c
+++ b/hw/vfio/container-base.c
@@ -18,7 +18,7 @@
#include "system/ram_addr.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
-#include "hw/vfio/vfio-container-base.h"
+#include "hw/vfio/vfio-container.h"
#include "hw/vfio/vfio-device.h" /* vfio_device_reset_handler */
#include "system/reset.h"
#include "vfio-helpers.h"
--
2.51.0
next prev parent reply other threads:[~2025-09-26 5:35 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 ` Cédric Le Goater [this message]
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 ` [PULL 11/29] vfio/spapr.c: use QOM casts where appropriate Cédric Le Goater
2025-09-26 5:33 ` [PULL 12/29] vfio/spapr.c: rename VFIOContainer bcontainer field to parent_obj 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-6-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).