[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH V1 07/10] migration: migration_is_device
From: |
Steve Sistare |
Subject: |
[PATCH V1 07/10] migration: migration_is_device |
Date: |
Tue, 27 Feb 2024 09:43:24 -0800 |
Define and export migration_is_device to eliminate a dependency
on MigrationState.
Signed-off-by: Steve Sistare <steven.sistare@oracle.com>
---
hw/vfio/common.c | 4 +---
include/migration/misc.h | 1 +
migration/migration.c | 7 +++++++
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index 2dbbf62..de01068 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -180,10 +180,8 @@ bool vfio_device_state_is_precopy(VFIODevice *vbasedev)
static bool vfio_devices_all_dirty_tracking(VFIOContainerBase *bcontainer)
{
VFIODevice *vbasedev;
- MigrationState *ms = migrate_get_current();
- if (!migration_is_active() &&
- ms->state != MIGRATION_STATUS_DEVICE) {
+ if (!migration_is_active() && !migration_is_device()) {
return false;
}
diff --git a/include/migration/misc.h b/include/migration/misc.h
index c4b5416..28cfaed 100644
--- a/include/migration/misc.h
+++ b/include/migration/misc.h
@@ -61,6 +61,7 @@ void migration_object_init(void);
void migration_shutdown(void);
bool migration_is_idle(void);
bool migration_is_active(void);
+bool migration_is_device(void);
bool migration_thread_is_self(void);
bool migration_is_setup_or_active(void);
bool migrate_mode_is_cpr(MigrationState *);
diff --git a/migration/migration.c b/migration/migration.c
index 27af48c..6b386af 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1614,6 +1614,13 @@ bool migration_is_active(void)
s->state == MIGRATION_STATUS_POSTCOPY_ACTIVE);
}
+bool migration_is_device(void)
+{
+ MigrationState *s = current_migration;
+
+ return s->state == MIGRATION_STATUS_DEVICE;
+}
+
bool migration_thread_is_self(void)
{
MigrationState *s = current_migration;
--
1.8.3.1
- Re: [PATCH V1 00/10] privatize migration.h, (continued)
- Re: [PATCH V1 00/10] privatize migration.h, Steven Sistare, 2024/02/27
- [PATCH V1 00/10] privatize migration.h, Steve Sistare, 2024/02/27
- [PATCH V1 01/10] migration: remove migration.h references, Steve Sistare, 2024/02/27
- [PATCH V1 02/10] migration: export migration_is_setup_or_active, Steve Sistare, 2024/02/27
- [PATCH V1 03/10] migration: export migration_is_active, Steve Sistare, 2024/02/27
- [PATCH V1 04/10] migration: export migration_is_running, Steve Sistare, 2024/02/27
- [PATCH V1 05/10] migration: export vcpu_dirty_limit_period, Steve Sistare, 2024/02/27
- [PATCH V1 06/10] migration: migration_thread_is_self, Steve Sistare, 2024/02/27
- [PATCH V1 08/10] migration: migration_file_set_error, Steve Sistare, 2024/02/27
- [PATCH V1 07/10] migration: migration_is_device,
Steve Sistare <=
- [PATCH V1 10/10] migration: purge MigrationState from public interface, Steve Sistare, 2024/02/27
- [PATCH V1 09/10] migration: privatize colo interfaces, Steve Sistare, 2024/02/27