From 92d7a11085088881b2a5d78825e5961314e25524 Mon Sep 17 00:00:00 2001 From: Avihai Horon Date: Mon, 6 Jul 2026 11:51:59 +0300 Subject: [PATCH] migration: Log the approver in qemu_loadvm_approve_switchover() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Pass the device name that approved switchover to qemu_loadvm_approve_switchover() and log it in the trace for debugging purposes. Reviewed-by: Peter Xu Signed-off-by: Avihai Horon Link: https://lore.kernel.org/qemu-devel/20260706085211.13905-5-avihaih@nvidia.com Signed-off-by: Cédric Le Goater --- hw/vfio/migration.c | 2 +- migration/savevm.c | 4 ++-- migration/savevm.h | 2 +- migration/trace-events | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c index 195498845e..180b316bae 100644 --- a/hw/vfio/migration.c +++ b/hw/vfio/migration.c @@ -847,7 +847,7 @@ static int vfio_load_state(QEMUFile *f, void *opaque, int version_id) return -EINVAL; } - ret = qemu_loadvm_approve_switchover(); + ret = qemu_loadvm_approve_switchover(vbasedev->name); if (ret) { error_report( "%s: qemu_loadvm_approve_switchover failed, err=%d (%s)", diff --git a/migration/savevm.c b/migration/savevm.c index 74d622583e..be81de2616 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -3174,7 +3174,7 @@ int qemu_load_device_state(QEMUFile *f, Error **errp) return 0; } -int qemu_loadvm_approve_switchover(void) +int qemu_loadvm_approve_switchover(const char *approver) { MigrationIncomingState *mis = migration_incoming_get_current(); @@ -3183,7 +3183,7 @@ int qemu_loadvm_approve_switchover(void) } mis->switchover_ack_pending_num--; - trace_loadvm_approve_switchover(mis->switchover_ack_pending_num); + trace_loadvm_approve_switchover(approver, mis->switchover_ack_pending_num); if (mis->switchover_ack_pending_num) { return 0; diff --git a/migration/savevm.h b/migration/savevm.h index 81abd96dda..44424be347 100644 --- a/migration/savevm.h +++ b/migration/savevm.h @@ -71,7 +71,7 @@ void qemu_loadvm_state_cleanup(MigrationIncomingState *mis); int qemu_loadvm_state_main(QEMUFile *f, MigrationIncomingState *mis, Error **errp); int qemu_load_device_state(QEMUFile *f, Error **errp); -int qemu_loadvm_approve_switchover(void); +int qemu_loadvm_approve_switchover(const char *approver); int qemu_savevm_state_non_iterable(QEMUFile *f, Error **errp); int qemu_savevm_state_non_iterable_early(QEMUFile *f, JSONWriter *vmdesc, diff --git a/migration/trace-events b/migration/trace-events index 1c9212d3e2..c0c433744c 100644 --- a/migration/trace-events +++ b/migration/trace-events @@ -24,7 +24,7 @@ loadvm_postcopy_ram_handle_discard_end(void) "" loadvm_postcopy_ram_handle_discard_header(const char *ramid, uint16_t len) "%s: %ud" loadvm_process_command(const char *s, uint16_t len) "com=%s len=%d" loadvm_process_command_ping(uint32_t val) "0x%x" -loadvm_approve_switchover(unsigned int switchover_ack_pending_num) "Switchover ack pending num=%u" +loadvm_approve_switchover(const char *approver, unsigned int switchover_ack_pending_num) "Approver %s, switchover_ack_pending_num %u" postcopy_ram_listen_thread_exit(void) "" postcopy_ram_listen_thread_start(void) "" qemu_savevm_send_postcopy_advise(void) ""