migration: Log the approver in qemu_loadvm_approve_switchover()
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 <peterx@redhat.com> Signed-off-by: Avihai Horon <avihaih@nvidia.com> Link: https://lore.kernel.org/qemu-devel/20260706085211.13905-5-avihaih@nvidia.com Signed-off-by: Cédric Le Goater <clg@redhat.com>
Avihai Horon committed
Jul 6, 2026 at 11:51 UTC
92d7a11085088881b2a5d78825e5961314e25524
4 files changed
+5
-5
hw/vfio/migration.c
+1
-1
@@ -847,7 +847,7 @@ static int vfio_load_state(QEMUFile *f, void *opaque, int version_id)
847
return -EINVAL;
848
}
849
850
- ret = qemu_loadvm_approve_switchover();
850
+ ret = qemu_loadvm_approve_switchover(vbasedev->name);
851
if (ret) {
852
error_report(
853
"%s: qemu_loadvm_approve_switchover failed, err=%d (%s)",
migration/savevm.c
+2
-2
@@ -3174,7 +3174,7 @@ int qemu_load_device_state(QEMUFile *f, Error **errp)
3174
return 0;
3175
}
3176
3177
-int qemu_loadvm_approve_switchover(void)
3177
+int qemu_loadvm_approve_switchover(const char *approver)
3178
{
3179
MigrationIncomingState *mis = migration_incoming_get_current();
3180
@@ -3183,7 +3183,7 @@ int qemu_loadvm_approve_switchover(void)
3183
}
3184
3185
mis->switchover_ack_pending_num--;
3186
- trace_loadvm_approve_switchover(mis->switchover_ack_pending_num);
3186
+ trace_loadvm_approve_switchover(approver, mis->switchover_ack_pending_num);
3187
3188
if (mis->switchover_ack_pending_num) {
3189
return 0;
migration/savevm.h
+1
-1
@@ -71,7 +71,7 @@ void qemu_loadvm_state_cleanup(MigrationIncomingState *mis);
71
int qemu_loadvm_state_main(QEMUFile *f, MigrationIncomingState *mis,
72
Error **errp);
73
int qemu_load_device_state(QEMUFile *f, Error **errp);
74
-int qemu_loadvm_approve_switchover(void);
74
+int qemu_loadvm_approve_switchover(const char *approver);
75
int qemu_savevm_state_non_iterable(QEMUFile *f, Error **errp);
76
int qemu_savevm_state_non_iterable_early(QEMUFile *f,
77
JSONWriter *vmdesc,
migration/trace-events
+1
-1
@@ -24,7 +24,7 @@ loadvm_postcopy_ram_handle_discard_end(void) ""
24
loadvm_postcopy_ram_handle_discard_header(const char *ramid, uint16_t len) "%s: %ud"
25
loadvm_process_command(const char *s, uint16_t len) "com=%s len=%d"
26
loadvm_process_command_ping(uint32_t val) "0x%x"
27
-loadvm_approve_switchover(unsigned int switchover_ack_pending_num) "Switchover ack pending num=%u"
27
+loadvm_approve_switchover(const char *approver, unsigned int switchover_ack_pending_num) "Approver %s, switchover_ack_pending_num %u"
28
postcopy_ram_listen_thread_exit(void) ""
29
postcopy_ram_listen_thread_start(void) ""
30
qemu_savevm_send_postcopy_advise(void) ""