qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Peter Xu <peterx@redhat.com>
To: qemu-devel@nongnu.org
Cc: David Edmondson <david.edmondson@oracle.com>,
	"Dr . David Alan Gilbert" <dgilbert@redhat.com>,
	Leonardo Bras Soares Passos <lsoaresp@redhat.com>,
	peterx@redhat.com, Juan Quintela <quintela@redhat.com>
Subject: [PATCH v3 1/8] migration: Drop dead code of ram_debug_dump_bitmap()
Date: Fri, 24 Dec 2021 14:49:53 +0800	[thread overview]
Message-ID: <20211224065000.97572-2-peterx@redhat.com> (raw)
In-Reply-To: <20211224065000.97572-1-peterx@redhat.com>

I planned to add "#ifdef DEBUG_POSTCOPY" around the function too because
otherwise it'll be compiled into qemu binary even if it'll never be used.  Then
I found that maybe it's easier to just drop it for good..

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
---
 migration/ram.c | 39 ---------------------------------------
 migration/ram.h |  2 --
 2 files changed, 41 deletions(-)

diff --git a/migration/ram.c b/migration/ram.c
index 57efa67f20..7d9c8a508b 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -2408,40 +2408,6 @@ static void ram_state_reset(RAMState *rs)
 
 #define MAX_WAIT 50 /* ms, half buffered_file limit */
 
-/*
- * 'expected' is the value you expect the bitmap mostly to be full
- * of; it won't bother printing lines that are all this value.
- * If 'todump' is null the migration bitmap is dumped.
- */
-void ram_debug_dump_bitmap(unsigned long *todump, bool expected,
-                           unsigned long pages)
-{
-    int64_t cur;
-    int64_t linelen = 128;
-    char linebuf[129];
-
-    for (cur = 0; cur < pages; cur += linelen) {
-        int64_t curb;
-        bool found = false;
-        /*
-         * Last line; catch the case where the line length
-         * is longer than remaining ram
-         */
-        if (cur + linelen > pages) {
-            linelen = pages - cur;
-        }
-        for (curb = 0; curb < linelen; curb++) {
-            bool thisbit = test_bit(cur + curb, todump);
-            linebuf[curb] = thisbit ? '1' : '.';
-            found = found || (thisbit != expected);
-        }
-        if (found) {
-            linebuf[curb] = '\0';
-            fprintf(stderr,  "0x%08" PRIx64 " : %s\n", cur, linebuf);
-        }
-    }
-}
-
 /* **** functions for postcopy ***** */
 
 void ram_postcopy_migrated_memory_release(MigrationState *ms)
@@ -2669,11 +2635,6 @@ int ram_postcopy_send_discard_bitmap(MigrationState *ms)
         if (ret) {
             return ret;
         }
-
-#ifdef DEBUG_POSTCOPY
-        ram_debug_dump_bitmap(block->bmap, true,
-                              block->used_length >> TARGET_PAGE_BITS);
-#endif
     }
     trace_ram_postcopy_send_discard_bitmap();
 
diff --git a/migration/ram.h b/migration/ram.h
index c515396a9a..f543e25765 100644
--- a/migration/ram.h
+++ b/migration/ram.h
@@ -55,8 +55,6 @@ void mig_throttle_counter_reset(void);
 uint64_t ram_pagesize_summary(void);
 int ram_save_queue_pages(const char *rbname, ram_addr_t start, ram_addr_t len);
 void acct_update_position(QEMUFile *f, size_t size, bool zero);
-void ram_debug_dump_bitmap(unsigned long *todump, bool expected,
-                           unsigned long pages);
 void ram_postcopy_migrated_memory_release(MigrationState *ms);
 /* For outgoing discard bitmap */
 int ram_postcopy_send_discard_bitmap(MigrationState *ms);
-- 
2.32.0



  reply	other threads:[~2021-12-24  7:09 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-24  6:49 [PATCH v3 0/8] migration: Postcopy cleanup on ram disgard Peter Xu
2021-12-24  6:49 ` Peter Xu [this message]
2021-12-30 15:53   ` [PATCH v3 1/8] migration: Drop dead code of ram_debug_dump_bitmap() Philippe Mathieu-Daudé
2021-12-24  6:49 ` [PATCH v3 2/8] migration: Don't return for postcopy_chunk_hostpages() Peter Xu
2021-12-30 15:53   ` Philippe Mathieu-Daudé
2021-12-24  6:49 ` [PATCH v3 3/8] migration: Drop postcopy_chunk_hostpages() Peter Xu
2021-12-24  6:49 ` [PATCH v3 4/8] migration: Do chunk page in postcopy_each_ram_send_discard() Peter Xu
2021-12-24  6:49 ` [PATCH v3 5/8] migration: Drop return code for disgard ram process Peter Xu
2021-12-30 16:03   ` Philippe Mathieu-Daudé
2021-12-24  6:49 ` [PATCH v3 6/8] migration: Dump sub-cmd name in loadvm_process_command tp Peter Xu
2021-12-24 10:56   ` David Edmondson
2021-12-30 15:58   ` Philippe Mathieu-Daudé
2021-12-24  6:49 ` [PATCH v3 7/8] migration: Finer grained tracepoints for POSTCOPY_LISTEN Peter Xu
2021-12-24 10:56   ` David Edmondson
2021-12-30 15:56   ` Philippe Mathieu-Daudé
2021-12-24  6:50 ` [PATCH v3 8/8] migration: Tracepoint change in postcopy-run bottom half Peter Xu
2021-12-24 10:57   ` David Edmondson
2021-12-30 15:57   ` Philippe Mathieu-Daudé

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211224065000.97572-2-peterx@redhat.com \
    --to=peterx@redhat.com \
    --cc=david.edmondson@oracle.com \
    --cc=dgilbert@redhat.com \
    --cc=lsoaresp@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=quintela@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).