[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/33] migration: consolidate time info into populate
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PULL 03/33] migration: consolidate time info into populate_time_info |
Date: |
Thu, 15 Aug 2019 17:34:34 +0100 |
From: Wei Yang <address@hidden>
Consolidate time information fill up into its function for better
readability.
Signed-off-by: Wei Yang <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
migration/migration.c | 40 ++++++++++++++++++++++------------------
1 file changed, 22 insertions(+), 18 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 28342969ea..7c66da3a83 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -823,6 +823,25 @@ bool migration_is_setup_or_active(int state)
}
}
+static void populate_time_info(MigrationInfo *info, MigrationState *s)
+{
+ info->has_status = true;
+ info->has_setup_time = true;
+ info->setup_time = s->setup_time;
+ if (s->state == MIGRATION_STATUS_COMPLETED) {
+ info->has_total_time = true;
+ info->total_time = s->total_time;
+ info->has_downtime = true;
+ info->downtime = s->downtime;
+ } else {
+ info->has_total_time = true;
+ info->total_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME) -
+ s->start_time;
+ info->has_expected_downtime = true;
+ info->expected_downtime = s->expected_downtime;
+ }
+}
+
static void populate_ram_info(MigrationInfo *info, MigrationState *s)
{
info->has_ram = true;
@@ -908,16 +927,8 @@ static void fill_source_migration_info(MigrationInfo *info)
case MIGRATION_STATUS_DEVICE:
case MIGRATION_STATUS_POSTCOPY_PAUSED:
case MIGRATION_STATUS_POSTCOPY_RECOVER:
- /* TODO add some postcopy stats */
- info->has_status = true;
- info->has_total_time = true;
- info->total_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME)
- - s->start_time;
- info->has_expected_downtime = true;
- info->expected_downtime = s->expected_downtime;
- info->has_setup_time = true;
- info->setup_time = s->setup_time;
-
+ /* TODO add some postcopy stats */
+ populate_time_info(info, s);
populate_ram_info(info, s);
populate_disk_info(info);
break;
@@ -926,14 +937,7 @@ static void fill_source_migration_info(MigrationInfo *info)
/* TODO: display COLO specific information (checkpoint info etc.) */
break;
case MIGRATION_STATUS_COMPLETED:
- info->has_status = true;
- info->has_total_time = true;
- info->total_time = s->total_time;
- info->has_downtime = true;
- info->downtime = s->downtime;
- info->has_setup_time = true;
- info->setup_time = s->setup_time;
-
+ populate_time_info(info, s);
populate_ram_info(info, s);
break;
case MIGRATION_STATUS_FAILED:
--
2.21.0
- [Qemu-devel] [PULL 00/33] migration queue, Dr. David Alan Gilbert (git), 2019/08/15
- [Qemu-devel] [PULL 01/33] migration: Add error_desc for file channel errors, Dr. David Alan Gilbert (git), 2019/08/15
- [Qemu-devel] [PULL 02/33] hw/net: fix vmxnet3 live migration, Dr. David Alan Gilbert (git), 2019/08/15
- [Qemu-devel] [PULL 03/33] migration: consolidate time info into populate_time_info,
Dr. David Alan Gilbert (git) <=
- [Qemu-devel] [PULL 05/33] migration/postcopy: break the loop when there is no more page to discard, Dr. David Alan Gilbert (git), 2019/08/15
- [Qemu-devel] [PULL 04/33] migration/postcopy: the valid condition is one less then end, Dr. David Alan Gilbert (git), 2019/08/15
- [Qemu-devel] [PULL 06/33] migration/postcopy: discard_length must not be 0, Dr. David Alan Gilbert (git), 2019/08/15
- [Qemu-devel] [PULL 07/33] migration/postcopy: reduce one operation to calculate fixup_start_addr, Dr. David Alan Gilbert (git), 2019/08/15
- [Qemu-devel] [PULL 08/33] migration/postcopy: do_fixup is true when host_offset is non-zero, Dr. David Alan Gilbert (git), 2019/08/15
- [Qemu-devel] [PULL 09/33] migration/savevm: flush file for iterable_only case, Dr. David Alan Gilbert (git), 2019/08/15
- [Qemu-devel] [PULL 10/33] migration/savevm: split qemu_savevm_state_complete_precopy() into two parts, Dr. David Alan Gilbert (git), 2019/08/15
- [Qemu-devel] [PULL 11/33] migration/savevm: move non SaveStateEntry condition check out of iteration, Dr. David Alan Gilbert (git), 2019/08/15
- [Qemu-devel] [PULL 12/33] migration/postcopy: PostcopyState is already set in loadvm_postcopy_handle_advise(), Dr. David Alan Gilbert (git), 2019/08/15
- [Qemu-devel] [PULL 13/33] migration/postcopy: start_postcopy could be true only when migrate_postcopy() return true, Dr. David Alan Gilbert (git), 2019/08/15