diff options
| author | Philippe Mathieu-Daudé <philmd@linaro.org> | 2023-02-15 16:35:17 +0100 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2023-02-15 19:09:25 +0100 |
| commit | 163b8663b87fa1bfc34a171dd19ea435d108fa61 (patch) | |
| tree | 01b318be5fcc1f6c7688e824925e5cf82cbcb7e3 | |
| parent | c7a7db4b517842633ea5ab6c848a10449b5b913a (diff) | |
| download | qemu-163b8663b87fa1bfc34a171dd19ea435d108fa61.zip qemu-163b8663b87fa1bfc34a171dd19ea435d108fa61.tar.gz qemu-163b8663b87fa1bfc34a171dd19ea435d108fa61.tar.bz2 | |
migration/block: Convert remaining DPRINTF() debug macro to trace events
Finish the conversion from commit fe80c0241d
("migration: using trace_ to replace DPRINTF").
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
| -rw-r--r-- | migration/block.c | 12 | ||||
| -rw-r--r-- | migration/trace-events | 1 |
2 files changed, 2 insertions, 11 deletions
diff --git a/migration/block.c b/migration/block.c index 29f6902..b5ce506 100644 --- a/migration/block.c +++ b/migration/block.c @@ -42,16 +42,6 @@ #define MAX_IO_BUFFERS 512 #define MAX_PARALLEL_IO 16 -/* #define DEBUG_BLK_MIGRATION */ - -#ifdef DEBUG_BLK_MIGRATION -#define DPRINTF(fmt, ...) \ - do { printf("blk_migration: " fmt, ## __VA_ARGS__); } while (0) -#else -#define DPRINTF(fmt, ...) \ - do { } while (0) -#endif - typedef struct BlkMigDevState { /* Written during setup phase. Can be read without a lock. */ BlockBackend *blk; @@ -502,7 +492,7 @@ static int blk_mig_save_bulked_block(QEMUFile *f) block_mig_state.prev_progress = progress; qemu_put_be64(f, (progress << BDRV_SECTOR_BITS) | BLK_MIG_FLAG_PROGRESS); - DPRINTF("Completed %d %%\r", progress); + trace_migration_block_progression(progress); } return ret; diff --git a/migration/trace-events b/migration/trace-events index 67b65a7..b20e127 100644 --- a/migration/trace-events +++ b/migration/trace-events @@ -357,6 +357,7 @@ migration_block_flush_blks(const char *action, int submitted, int read_done, int migration_block_save(const char *mig_stage, int submitted, int transferred) "Enter save live %s submitted %d transferred %d" migration_block_save_complete(void) "Block migration completed" migration_block_state_pending(uint64_t pending) "Enter save live pending %" PRIu64 +migration_block_progression(unsigned percent) "Completed %u%%" # page_cache.c migration_pagecache_init(int64_t max_num_items) "Setting cache buckets to %" PRId64 |