From: "Cédric Le Goater" <clg@redhat.com>
To: qemu-devel@nongnu.org, Alex Williamson <alex.williamson@redhat.com>
Cc: "Avihai Horon" <avihaih@nvidia.com>,
"Eric Auger" <eric.auger@redhat.com>,
"Zhenzhong Duan" <zhenzhong.duan@intel.com>,
"Cédric Le Goater" <clg@redhat.com>
Subject: [PATCH for-10.1 03/32] vfio: Introduce a new header file for external migration services
Date: Tue, 18 Mar 2025 10:53:46 +0100 [thread overview]
Message-ID: <20250318095415.670319-4-clg@redhat.com> (raw)
In-Reply-To: <20250318095415.670319-1-clg@redhat.com>
The migration core subsytem makes uses of the VFIO migration API to
collect statistics on the number of bytes transferred. These services
are declared in "hw/vfio/vfio-common.h" which also contains VFIO
internal declarations. Move the migration declarations into a new
header file "hw/vfio/vfio-migration.h" to reduce the exposure of VFIO
internals.
Signed-off-by: Cédric Le Goater <clg@redhat.com>
---
include/hw/vfio/vfio-common.h | 4 ----
include/hw/vfio/vfio-migration.h | 17 +++++++++++++++++
hw/vfio/migration-multifd.c | 1 +
hw/vfio/migration.c | 1 +
migration/target.c | 2 +-
5 files changed, 20 insertions(+), 5 deletions(-)
create mode 100644 include/hw/vfio/vfio-migration.h
diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h
index 9cfb3fb6931e71395ef1d67b0a743d8bc1433fdc..5fc7ee76573375bc8464baee29ab88974fac3d3b 100644
--- a/include/hw/vfio/vfio-common.h
+++ b/include/hw/vfio/vfio-common.h
@@ -290,13 +290,9 @@ extern VFIODeviceList vfio_device_list;
extern const MemoryListener vfio_memory_listener;
extern int vfio_kvm_device_fd;
-bool vfio_mig_active(void);
int vfio_block_multiple_devices_migration(VFIODevice *vbasedev, Error **errp);
void vfio_unblock_multiple_devices_migration(void);
bool vfio_viommu_preset(VFIODevice *vbasedev);
-int64_t vfio_mig_bytes_transferred(void);
-void vfio_mig_reset_bytes_transferred(void);
-void vfio_mig_add_bytes_transferred(unsigned long val);
bool vfio_device_state_is_running(VFIODevice *vbasedev);
bool vfio_device_state_is_precopy(VFIODevice *vbasedev);
diff --git a/include/hw/vfio/vfio-migration.h b/include/hw/vfio/vfio-migration.h
new file mode 100644
index 0000000000000000000000000000000000000000..259c532f64bdd002d512375df3140f291a0ade85
--- /dev/null
+++ b/include/hw/vfio/vfio-migration.h
@@ -0,0 +1,17 @@
+/*
+ * VFIO migration interface
+ *
+ * Copyright Red Hat, Inc. 2025
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#ifndef HW_VFIO_VFIO_MIGRATION_H
+#define HW_VFIO_VFIO_MIGRATION_H
+
+bool vfio_mig_active(void);
+int64_t vfio_mig_bytes_transferred(void);
+void vfio_mig_reset_bytes_transferred(void);
+void vfio_mig_add_bytes_transferred(unsigned long val);
+
+#endif /* HW_VFIO_VFIO_MIGRATION_H */
diff --git a/hw/vfio/migration-multifd.c b/hw/vfio/migration-multifd.c
index 378f6f3bf01f6a4155fb424f8028cb5380f27f02..fe84735ec2c7bd085820d25c06be558761fbe0d5 100644
--- a/hw/vfio/migration-multifd.c
+++ b/hw/vfio/migration-multifd.c
@@ -11,6 +11,7 @@
#include "qemu/osdep.h"
#include "hw/vfio/vfio-common.h"
+#include "hw/vfio/vfio-migration.h"
#include "migration/misc.h"
#include "qapi/error.h"
#include "qemu/bswap.h"
diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c
index 8bf65b8e11094b8363692dba3084b762362c7dd6..75096377ffecf62b3bab91102a00d723827ea4c7 100644
--- a/hw/vfio/migration.c
+++ b/hw/vfio/migration.c
@@ -17,6 +17,7 @@
#include "system/runstate.h"
#include "hw/vfio/vfio-common.h"
+#include "hw/vfio/vfio-migration.h"
#include "migration/misc.h"
#include "migration/savevm.h"
#include "migration/vmstate.h"
diff --git a/migration/target.c b/migration/target.c
index f5d8cfe7c2a3473f4bd3f5068145598c60973c58..e1eacd1db7a471cba51b4e257a834eb7581f9671 100644
--- a/migration/target.c
+++ b/migration/target.c
@@ -11,7 +11,7 @@
#include CONFIG_DEVICES
#ifdef CONFIG_VFIO
-#include "hw/vfio/vfio-common.h"
+#include "hw/vfio/vfio-migration.h"
#endif
#ifdef CONFIG_VFIO
--
2.48.1
next prev parent reply other threads:[~2025-03-18 9:59 UTC|newest]
Thread overview: 114+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-18 9:53 [PATCH for-10.1 00/32] vfio: Spring cleanup Cédric Le Goater
2025-03-18 9:53 ` [PATCH for-10.1 01/32] vfio: Move vfio_mig_active() into migration.c Cédric Le Goater
2025-03-19 9:10 ` John Levon
2025-03-19 11:54 ` Avihai Horon
2025-03-19 16:38 ` Cédric Le Goater
2025-03-18 9:53 ` [PATCH for-10.1 02/32] vfio: Rename vfio_reset_bytes_transferred() Cédric Le Goater
2025-03-19 7:33 ` Philippe Mathieu-Daudé
2025-03-19 9:10 ` John Levon
2025-03-19 12:07 ` Avihai Horon
2025-03-18 9:53 ` Cédric Le Goater [this message]
2025-03-19 11:48 ` [PATCH for-10.1 03/32] vfio: Introduce a new header file for external migration services Prasad Pandit
2025-03-19 12:37 ` Avihai Horon
2025-03-19 16:49 ` Cédric Le Goater
2025-03-18 9:53 ` [PATCH for-10.1 04/32] vfio: Make vfio_un/block_multiple_devices_migration() static Cédric Le Goater
2025-03-19 12:38 ` Joao Martins
2025-03-18 9:53 ` [PATCH for-10.1 05/32] vfio: Make vfio_viommu_preset() static Cédric Le Goater
2025-03-19 12:26 ` Joao Martins
2025-03-19 16:50 ` John Levon
2025-03-18 9:53 ` [PATCH for-10.1 06/32] vfio: Introduce a new header file for internal migration services Cédric Le Goater
2025-03-19 12:29 ` Prasad Pandit
2025-03-19 17:26 ` Cédric Le Goater
2025-03-20 6:19 ` Prasad Pandit
2025-03-19 14:05 ` Avihai Horon
2025-03-19 17:33 ` Cédric Le Goater
2025-03-19 16:55 ` John Levon
2025-03-18 9:53 ` [PATCH for-10.1 07/32] vfio: Introduce a new header file for VFIOdisplay declarations Cédric Le Goater
2025-03-20 9:50 ` John Levon
2025-03-18 9:53 ` [PATCH for-10.1 08/32] vfio: Move VFIOHostDMAWindow definition into spapr.c Cédric Le Goater
2025-03-20 9:43 ` John Levon
2025-03-18 9:53 ` [PATCH for-10.1 09/32] vfio: Introduce a new header file for VFIOIOMMUFD declarations Cédric Le Goater
2025-03-19 9:09 ` John Levon
2025-03-20 9:18 ` Duan, Zhenzhong
2025-03-20 13:37 ` Cédric Le Goater
2025-03-18 9:53 ` [PATCH for-10.1 10/32] vfio: Introduce new files for VFIORegion definitions and declarations Cédric Le Goater
2025-03-19 16:54 ` John Levon
2025-03-18 9:53 ` [PATCH for-10.1 11/32] vfio: Introduce a new header file for VFIOcontainer declarations Cédric Le Goater
2025-03-19 17:00 ` John Levon
2025-03-20 9:24 ` Duan, Zhenzhong
2025-03-18 9:53 ` [PATCH for-10.1 12/32] vfio: Make vfio_group_list static Cédric Le Goater
2025-03-20 9:28 ` Duan, Zhenzhong
2025-03-20 9:38 ` John Levon
2025-03-18 9:53 ` [PATCH for-10.1 13/32] vfio: Move VFIOAddressSpace helpers into container-base.c Cédric Le Goater
2025-03-19 16:45 ` John Levon
2025-03-20 9:36 ` Duan, Zhenzhong
2025-03-20 19:26 ` Cédric Le Goater
2025-03-21 7:18 ` Duan, Zhenzhong
2025-03-18 9:53 ` [PATCH for-10.1 14/32] vfio: Move Host IOMMU type declarations into their respective files Cédric Le Goater
2025-03-19 9:10 ` John Levon
2025-03-20 9:36 ` Duan, Zhenzhong
2025-03-18 9:53 ` [PATCH for-10.1 15/32] vfio: Introduce a new header file for helper services Cédric Le Goater
2025-03-20 9:40 ` John Levon
2025-03-21 9:25 ` Cédric Le Goater
2025-03-21 11:17 ` John Levon
2025-03-18 9:53 ` [PATCH for-10.1 16/32] vfio: Move vfio_get_info_dma_avail() into helpers.c Cédric Le Goater
2025-03-19 16:50 ` John Levon
2025-03-18 9:54 ` [PATCH for-10.1 17/32] vfio: Move vfio_kvm_device_add/del_fd() to helpers.c Cédric Le Goater
2025-03-19 16:46 ` John Levon
2025-03-20 9:40 ` Duan, Zhenzhong
2025-03-18 9:54 ` [PATCH for-10.1 18/32] vfio: Move vfio_get_device_info() " Cédric Le Goater
2025-03-20 9:41 ` John Levon
2025-03-20 9:42 ` Duan, Zhenzhong
2025-03-18 9:54 ` [PATCH for-10.1 19/32] vfio: Introduce a new file for VFIODevice definitions Cédric Le Goater
2025-03-19 16:42 ` John Levon
2025-03-20 9:01 ` Cédric Le Goater
2025-03-18 9:54 ` [PATCH for-10.1 20/32] vfio: Introduce new files for CPR definitions and declarations Cédric Le Goater
2025-03-19 17:01 ` John Levon
2025-03-18 9:54 ` [PATCH for-10.1 21/32] vfio: Move vfio_kvm_device_fd() into helpers.c Cédric Le Goater
2025-03-20 9:44 ` John Levon
2025-03-18 9:54 ` [PATCH for-10.1 22/32] vfio: Move vfio_device_list into device.c Cédric Le Goater
2025-03-20 9:29 ` John Levon
2025-03-18 9:54 ` [PATCH for-10.1 23/32] vfio: Move vfio_de/attach_device() " Cédric Le Goater
2025-03-19 16:58 ` John Levon
2025-03-18 9:54 ` [PATCH for-10.1 24/32] vfio: Introduce new files for dirty tracking definitions and declarations Cédric Le Goater
2025-03-19 13:23 ` Joao Martins
2025-03-20 9:46 ` John Levon
2025-03-21 9:29 ` Cédric Le Goater
2025-03-20 9:52 ` Duan, Zhenzhong
2025-03-20 11:00 ` Joao Martins
2025-03-21 6:24 ` Duan, Zhenzhong
2025-03-21 9:31 ` Cédric Le Goater
2025-03-21 9:44 ` Duan, Zhenzhong
2025-03-18 9:54 ` [PATCH for-10.1 25/32] vfio: Move vfio_set_migration_error() into migration.c Cédric Le Goater
2025-03-19 12:12 ` Prasad Pandit
2025-03-21 10:19 ` Cédric Le Goater
2025-03-24 4:40 ` Prasad Pandit
2025-03-19 17:00 ` John Levon
2025-03-18 9:54 ` [PATCH for-10.1 26/32] vfio: Rename vfio-common.h to vfio-device.h Cédric Le Goater
2025-03-19 14:27 ` Avihai Horon
2025-03-21 11:03 ` Cédric Le Goater
2025-03-19 16:56 ` John Levon
2025-03-18 9:54 ` [PATCH for-10.1 27/32] vfio: Rename VFIODevice related services Cédric Le Goater
2025-03-20 9:35 ` John Levon
2025-03-18 9:54 ` [PATCH for-10.1 28/32] vfio: Make vfio_devices_query_dirty_bitmap() static Cédric Le Goater
2025-03-19 12:14 ` Joao Martins
2025-03-19 16:54 ` John Levon
2025-03-18 9:54 ` [PATCH for-10.1 29/32] vfio: Rename VFIOContainer related services Cédric Le Goater
2025-03-20 9:38 ` John Levon
2025-03-18 9:54 ` [PATCH for-10.1 30/32] vfio: Rename VFIO dirty tracking services Cédric Le Goater
2025-03-19 12:21 ` Joao Martins
2025-03-20 11:13 ` Avihai Horon
2025-03-20 11:18 ` Joao Martins
2025-03-20 11:45 ` Avihai Horon
2025-03-20 11:56 ` Joao Martins
2025-03-20 12:24 ` Avihai Horon
2025-03-21 11:22 ` Cédric Le Goater
2025-03-31 12:49 ` Joao Martins
2025-03-31 13:14 ` Cédric Le Goater
2025-03-20 9:42 ` John Levon
2025-03-18 9:54 ` [PATCH for-10.1 31/32] vfio: Introduce vfio_dirty_tracking_un/register() routines Cédric Le Goater
2025-03-19 13:24 ` Joao Martins
2025-03-20 12:28 ` Joao Martins
2025-03-20 9:49 ` John Levon
2025-03-18 9:54 ` [PATCH for-10.1 32/32] vfio: Rename RAM discard related services Cédric Le Goater
2025-03-19 16:57 ` John Levon
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=20250318095415.670319-4-clg@redhat.com \
--to=clg@redhat.com \
--cc=alex.williamson@redhat.com \
--cc=avihaih@nvidia.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).