71 lines
4.4 KiB
Diff
71 lines
4.4 KiB
Diff
|
From 619ad79630f5ff2c634fa2785acdaa8dc2f66f62 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@redhat.com>
|
||
|
|
Date: Wed, 6 Nov 2024 17:28:32 +0100
|
||
|
|
Subject: [PATCH 25/27] vfio/migration: Change trace formats from hex to
|
||
|
|
decimal
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
RH-Author: Cédric Le Goater <clg@redhat.com>
|
||
|
|
RH-MergeRequest: 282: vfio/migration: Report only stop-copy size in vfio_state_pending_exact()
|
||
|
|
RH-Jira: RHEL-64307
|
||
|
|
RH-Acked-by: Peter Xu <peterx@redhat.com>
|
||
|
|
RH-Acked-by: Alex Williamson <None>
|
||
|
|
RH-Commit: [2/2] 04c78dea168c6b4edbbf0cbddadb0d760e7afeb5 (clegoate/qemu-kvm-c9s)
|
||
|
|
|
||
|
|
JIRA: https://issues.redhat.com/browse/RHEL-64307
|
||
|
|
|
||
|
|
commit fa4e20defe239e42af0a1b5c030dec114f799f56
|
||
|
|
Author: Avihai Horon <avihaih@nvidia.com>
|
||
|
|
Date: Sun Oct 20 16:01:08 2024 +0300
|
||
|
|
|
||
|
|
vfio/migration: Change trace formats from hex to decimal
|
||
|
|
|
||
|
|
Data sizes in VFIO migration trace events are printed in hex format
|
||
|
|
while in migration core trace events they are printed in decimal format.
|
||
|
|
|
||
|
|
This inconsistency makes it less readable when using both trace event
|
||
|
|
types. Hence, change the data sizes print format to decimal in VFIO
|
||
|
|
migration trace events.
|
||
|
|
|
||
|
|
Signed-off-by: Avihai Horon <avihaih@nvidia.com>
|
||
|
|
Reviewed-by: Cédric Le Goater <clg@redhat.com>
|
||
|
|
|
||
|
|
Signed-off-by: Cédric Le Goater <clg@redhat.com>
|
||
|
|
---
|
||
|
|
hw/vfio/trace-events | 10 +++++-----
|
||
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/hw/vfio/trace-events b/hw/vfio/trace-events
|
||
|
|
index 98bd4dccea..3756ff660e 100644
|
||
|
|
--- a/hw/vfio/trace-events
|
||
|
|
+++ b/hw/vfio/trace-events
|
||
|
|
@@ -151,7 +151,7 @@ vfio_display_edid_write_error(void) ""
|
||
|
|
vfio_load_cleanup(const char *name) " (%s)"
|
||
|
|
vfio_load_device_config_state(const char *name) " (%s)"
|
||
|
|
vfio_load_state(const char *name, uint64_t data) " (%s) data 0x%"PRIx64
|
||
|
|
-vfio_load_state_device_data(const char *name, uint64_t data_size, int ret) " (%s) size 0x%"PRIx64" ret %d"
|
||
|
|
+vfio_load_state_device_data(const char *name, uint64_t data_size, int ret) " (%s) size %"PRIu64" ret %d"
|
||
|
|
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"
|
||
|
|
@@ -160,10 +160,10 @@ vfio_save_block(const char *name, int data_size) " (%s) data_size %d"
|
||
|
|
vfio_save_cleanup(const char *name) " (%s)"
|
||
|
|
vfio_save_complete_precopy(const char *name, int ret) " (%s) ret %d"
|
||
|
|
vfio_save_device_config_state(const char *name) " (%s)"
|
||
|
|
-vfio_save_iterate(const char *name, uint64_t precopy_init_size, uint64_t precopy_dirty_size) " (%s) precopy initial size 0x%"PRIx64" precopy dirty size 0x%"PRIx64
|
||
|
|
-vfio_save_setup(const char *name, uint64_t data_buffer_size) " (%s) data buffer size 0x%"PRIx64
|
||
|
|
-vfio_state_pending_estimate(const char *name, uint64_t precopy, uint64_t postcopy, uint64_t precopy_init_size, uint64_t precopy_dirty_size) " (%s) precopy 0x%"PRIx64" postcopy 0x%"PRIx64" precopy initial size 0x%"PRIx64" precopy dirty size 0x%"PRIx64
|
||
|
|
-vfio_state_pending_exact(const char *name, uint64_t precopy, uint64_t postcopy, uint64_t stopcopy_size, uint64_t precopy_init_size, uint64_t precopy_dirty_size) " (%s) precopy 0x%"PRIx64" postcopy 0x%"PRIx64" stopcopy size 0x%"PRIx64" precopy initial size 0x%"PRIx64" precopy dirty size 0x%"PRIx64
|
||
|
|
+vfio_save_iterate(const char *name, uint64_t precopy_init_size, uint64_t precopy_dirty_size) " (%s) precopy initial size %"PRIu64" precopy dirty size %"PRIu64
|
||
|
|
+vfio_save_setup(const char *name, uint64_t data_buffer_size) " (%s) data buffer size %"PRIu64
|
||
|
|
+vfio_state_pending_estimate(const char *name, uint64_t precopy, uint64_t postcopy, uint64_t precopy_init_size, uint64_t precopy_dirty_size) " (%s) precopy %"PRIu64" postcopy %"PRIu64" precopy initial size %"PRIu64" precopy dirty size %"PRIu64
|
||
|
|
+vfio_state_pending_exact(const char *name, uint64_t precopy, uint64_t postcopy, uint64_t stopcopy_size, uint64_t precopy_init_size, uint64_t precopy_dirty_size) " (%s) precopy %"PRIu64" postcopy %"PRIu64" stopcopy size %"PRIu64" precopy initial size %"PRIu64" precopy dirty size %"PRIu64
|
||
|
|
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"
|
||
|
|
|
||
|
|
--
|
||
|
|
2.39.3
|
||
|
|
|