[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 54/54] migration: Remove MigrationState parameter fr
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 54/54] migration: Remove MigrationState parameter from migration_is_idle() |
Date: |
Thu, 6 Apr 2017 15:09:13 +0200 |
Only user don't have a MigrationState handly.
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
---
include/migration/migration.h | 2 +-
migration/migration.c | 8 +++-----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/include/migration/migration.h b/include/migration/migration.h
index b84ec3d..ba1a16c 100644
--- a/include/migration/migration.h
+++ b/include/migration/migration.h
@@ -234,7 +234,7 @@ void remove_migration_state_change_notifier(Notifier
*notify);
MigrationState *migrate_init(const MigrationParams *params);
bool migration_is_blocked(Error **errp);
bool migration_in_setup(MigrationState *);
-bool migration_is_idle(MigrationState *s);
+bool migration_is_idle(void);
bool migration_has_finished(MigrationState *);
bool migration_has_failed(MigrationState *);
/* True if outgoing migration has entered postcopy phase */
diff --git a/migration/migration.c b/migration/migration.c
index e9e2aa2..f247f7a 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1067,11 +1067,9 @@ bool migration_in_postcopy_after_devices(MigrationState
*s)
return migration_in_postcopy() && s->postcopy_after_devices;
}
-bool migration_is_idle(MigrationState *s)
+bool migration_is_idle(void)
{
- if (!s) {
- s = migrate_get_current();
- }
+ MigrationState *s = migrate_get_current();
switch (s->state) {
case MIGRATION_STATUS_NONE:
@@ -1136,7 +1134,7 @@ int migrate_add_blocker(Error *reason, Error **errp)
return -EACCES;
}
- if (migration_is_idle(NULL)) {
+ if (migration_is_idle()) {
migration_blockers = g_slist_prepend(migration_blockers, reason);
return 0;
}
--
2.9.3
- [Qemu-devel] [PATCH 49/54] ram: Remember last_page instead of last_offset, (continued)
- [Qemu-devel] [PATCH 49/54] ram: Remember last_page instead of last_offset, Juan Quintela, 2017/04/06
- [Qemu-devel] [PATCH 48/54] ram: Use page number instead of an address for the bitmap operations, Juan Quintela, 2017/04/06
- [Qemu-devel] [PATCH 50/54] ram: Change offset field in PageSearchStatus to page, Juan Quintela, 2017/04/06
- [Qemu-devel] [PATCH 51/54] ram: Use ramblock and page offset instead of absolute offset, Juan Quintela, 2017/04/06
- [Qemu-devel] [PATCH 52/54] ram: rename last_ram_offset() last_ram_pages(), Juan Quintela, 2017/04/06
- [Qemu-devel] [PATCH 53/54] ram: Use RAMBitmap type for coherence, Juan Quintela, 2017/04/06
- [Qemu-devel] [PATCH 54/54] migration: Remove MigrationState parameter from migration_is_idle(),
Juan Quintela <=