Commit 55c4446b authored by Juan Quintela's avatar Juan Quintela Committed by Dr. David Alan Gilbert
Browse files

migration: transform remaining DPRINTF into trace_ 



So we can remove DPRINTF() macro

Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
Message-Id: <1485207141-1941-2-git-send-email-quintela@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
  Fixed up 'remained/remaining' as requested by Eric
parent 20daa90a

migration/ram.c

+4 −14
Original line number Diff line number Diff line
@@ -45,14 +45,6 @@ 
#include "qemu/rcu_queue.h"

#include "migration/colo.h"



#ifdef DEBUG_MIGRATION_RAM

#define DPRINTF(fmt, ...) \

    do { fprintf(stdout, "migration_ram: " fmt, ## __VA_ARGS__); } while (0)

#else

#define DPRINTF(fmt, ...) \

    do { } while (0)

#endif



static int dirty_rate_high_cnt;



static uint64_t bitmap_sync_count;
@@ -507,10 +499,10 @@ static int save_xbzrle_page(QEMUFile *f, uint8_t **current_data, 
                                       TARGET_PAGE_SIZE, XBZRLE.encoded_buf,

                                       TARGET_PAGE_SIZE);

    if (encoded_len == 0) {

        DPRINTF("Skipping unmodified page\n");

        trace_save_xbzrle_page_skipping();

        return 0;

    } else if (encoded_len == -1) {

        DPRINTF("Overflow\n");

        trace_save_xbzrle_page_overflow();

        acct_info.xbzrle_overflows++;

        /* update data in the cache */

        if (!last_stage) {
@@ -2020,8 +2012,7 @@ static int ram_save_iterate(QEMUFile *f, void *opaque) 
        if ((i & 63) == 0) {

            uint64_t t1 = (qemu_clock_get_ns(QEMU_CLOCK_REALTIME) - t0) / 1000000;

            if (t1 > MAX_WAIT) {

                DPRINTF("big wait: %" PRIu64 " milliseconds, %d iterations\n",

                        t1, i);

                trace_ram_save_iterate_big_wait(t1, i);

                break;

            }

        }
@@ -2594,8 +2585,7 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) 


    wait_for_decompress_done();

    rcu_read_unlock();

    DPRINTF("Completed load of VM with exit code %d seq iteration "

            "%" PRIu64 "\n", ret, seq_iter);

    trace_ram_load_complete(ret, seq_iter);

    return ret;

}

migration/trace-events

+4 −0
Original line number Diff line number Diff line
@@ -190,6 +190,10 @@ postcopy_ram_incoming_cleanup_closeuf(void) "" 
postcopy_ram_incoming_cleanup_entry(void) ""

postcopy_ram_incoming_cleanup_exit(void) ""

postcopy_ram_incoming_cleanup_join(void) ""

save_xbzrle_page_skipping(void) ""

save_xbzrle_page_overflow(void) ""

ram_save_iterate_big_wait(uint64_t milliconds, int iterations) "big wait: %" PRIu64 " milliseconds, %d iterations"

ram_load_complete(int ret, uint64_t seq_iter) "exit_code %d seq iteration %" PRIu64



# migration/exec.c

migration_exec_outgoing(const char *cmd) "cmd=%s"