diff options
| author | Juan Quintela <quintela@redhat.com> | 2023-10-17 19:23:03 +0200 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2023-10-17 22:14:51 +0200 |
| commit | 17cd011d06ba91eb8f8f1ba97d0b1be6effcad41 (patch) | |
| tree | 027c9de7702cdddf1bdb2233f0ef5f444cbce67b /migration/migration-hmp-cmds.c | |
| parent | bef4e2ed8ea9de96f3c5493deadcd0f33367da2e (diff) | |
migration: Print block status when needed
The new line was only printed when command options were used. When we
used migration parameters and capabilities, it wasn't.
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-ID: <20231017172307.22858-2-quintela@redhat.com>
Diffstat (limited to 'migration/migration-hmp-cmds.c')
| -rw-r--r-- | migration/migration-hmp-cmds.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/migration/migration-hmp-cmds.c b/migration/migration-hmp-cmds.c index d206700a43..a82597f18e 100644 --- a/migration/migration-hmp-cmds.c +++ b/migration/migration-hmp-cmds.c @@ -30,6 +30,7 @@ #include "sysemu/runstate.h" #include "ui/qemu-spice.h" #include "sysemu/sysemu.h" +#include "options.h" #include "migration.h" static void migration_global_dump(Monitor *mon) @@ -696,7 +697,6 @@ void hmp_x_colo_lost_heartbeat(Monitor *mon, const QDict *qdict) typedef struct HMPMigrationStatus { QEMUTimer *timer; Monitor *mon; - bool is_block_migration; } HMPMigrationStatus; static void hmp_migrate_status_cb(void *opaque) @@ -722,7 +722,7 @@ static void hmp_migrate_status_cb(void *opaque) timer_mod(status->timer, qemu_clock_get_ms(QEMU_CLOCK_REALTIME) + 1000); } else { - if (status->is_block_migration) { + if (migrate_block()) { monitor_printf(status->mon, "\n"); } if (info->error_desc) { @@ -762,7 +762,6 @@ void hmp_migrate(Monitor *mon, const QDict *qdict) status = g_malloc0(sizeof(*status)); status->mon = mon; - status->is_block_migration = blk || inc; status->timer = timer_new_ms(QEMU_CLOCK_REALTIME, hmp_migrate_status_cb, status); timer_mod(status->timer, qemu_clock_get_ms(QEMU_CLOCK_REALTIME)); |