On Wed, Apr 29, 2026 at 05:46:19PM +0300, Avihai Horon wrote: > Ah sorry, I just noticed this now while doing some other work -- if you > respin the series, could you add the device name to both traces? And while > at it keep the traces alphabetically sorted?
Could you help check if below fixup is suitable to be squashed? Thanks, ===8<=== >From 930723da46e16c2ed5405916a7e10d4f560e22fa Mon Sep 17 00:00:00 2001 From: Peter Xu <[email protected]> Date: Wed, 29 Apr 2026 11:41:49 -0400 Subject: [PATCH] fixup! vfio/migration: Add tracepoints for precopy/stopcopy query ioctls Signed-off-by: Peter Xu <[email protected]> --- hw/vfio/migration.c | 6 ++++-- hw/vfio/trace-events | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c index 04d9f94edb..150e28656e 100644 --- a/hw/vfio/migration.c +++ b/hw/vfio/migration.c @@ -350,7 +350,8 @@ static int vfio_query_stop_copy_size(VFIODevice *vbasedev) ret = 0; } - trace_vfio_query_stop_copy_size(migration->stopcopy_size, ret); + trace_vfio_query_stop_copy_size(vbasedev->name, + migration->stopcopy_size, ret); return ret; } @@ -374,7 +375,8 @@ static int vfio_query_precopy_size(VFIOMigration *migration) ret = 0; } - trace_vfio_query_precopy_size(migration->precopy_init_size, + trace_vfio_query_precopy_size(migration->vbasedev->name, + migration->precopy_init_size, migration->precopy_dirty_size, ret); return ret; diff --git a/hw/vfio/trace-events b/hw/vfio/trace-events index 854a7e4b19..ab27ff5ea2 100644 --- a/hw/vfio/trace-events +++ b/hw/vfio/trace-events @@ -162,6 +162,8 @@ vfio_migration_realize(const char *name) " (%s)" vfio_migration_set_device_state(const char *name, const char *state) " (%s) state %s" vfio_migration_set_state(const char *name, const char *new_state, const char *recover_state) " (%s) new state %s, recover state %s" vfio_migration_state_notifier(const char *name, int state) " (%s) state %d" +vfio_query_stop_copy_size(const char *name, uint64_t size, int ret) " (%s) stopcopy size %"PRIu64" ret %d" +vfio_query_precopy_size(const char *name, uint64_t init_size, uint64_t dirty_size, int ret) " (%s) init %"PRIu64" dirty %"PRIu64" ret %d" vfio_save_block(const char *name, int data_size) " (%s) data_size %d" vfio_save_block_precopy_empty_hit(const char *name) " (%s)" vfio_save_cleanup(const char *name) " (%s)" @@ -176,8 +178,6 @@ vfio_save_setup(const char *name, uint64_t data_buffer_size) " (%s) data buffer vfio_state_pending(const char *name, uint64_t stopcopy_size, uint64_t precopy_init_size, uint64_t precopy_dirty_size, bool exact) " (%s) stopcopy size %"PRIu64" precopy initial size %"PRIu64" precopy dirty size %"PRIu64 " exact %d" vfio_vmstate_change(const char *name, int running, const char *reason, const char *dev_state) " (%s) running %d reason %s device state %s" vfio_vmstate_change_prepare(const char *name, int running, const char *reason, const char *dev_state) " (%s) running %d reason %s device state %s" -vfio_query_stop_copy_size(uint64_t size, int ret) "stopcopy size %"PRIu64" ret %d" -vfio_query_precopy_size(uint64_t init_size, uint64_t dirty_size, int ret) "init %"PRIu64" dirty %"PRIu64" ret %d" #iommufd.c -- 2.53.0 -- Peter Xu
