[Qemu-devel] [PATCH v2 7/8] DumpState: adding total_size and written_size fields

[Peter Xu]

Here, total_size is the size in bytes to be dumped (raw data, which
means before compression), while written_size are bytes handled (raw
size too).

These two fields could be used when do "dump-query". With these
information, we could get a very accurate percentage of finished
work.

Signed-off-by: Peter Xu <address@hidden>
---
 dump.c                | 36 +++++++++++++++++++++++++++++++++---
 include/sysemu/dump.h |  9 +++++++++
 2 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/dump.c b/dump.c
index 25298b7..65bd5fb 100644
--- a/dump.c
+++ b/dump.c
@@ -334,6 +334,8 @@ static void write_data(DumpState *s, void *buf, int length, 
Error **errp)
     if (ret < 0) {
         error_setg(errp, "dump: failed to save memory");
     }
+
+    s->written_size += length;
 }
 
 /* write the memory to vmcore. 1 page per I/O. */
@@ -1302,6 +1304,7 @@ static void write_dump_pages(DumpState *s, Error **errp)
                 goto out;
             }
         }
+        s->written_size += TARGET_PAGE_SIZE;
     }
 
     ret = write_cache(&page_desc, NULL, 0, true);
@@ -1420,6 +1423,30 @@ static void get_max_mapnr(DumpState *s)
     s->max_mapnr = paddr_to_pfn(last_block->target_end);
 }
 
+/* calculate total size of memory to be dumped (taking filter into
+ * acoount.) */
+static size_t dump_calculate_size(DumpState *s)
+{
+    GuestPhysBlock *block;
+    int64_t size = 0, total = 0, left = 0, right = 0;
+
+    QTAILQ_FOREACH(block, &s->guest_phys_blocks.head, next) {
+        if (s->has_filter) {
+            /* calculate the overlapped region. */
+            left = MAX(s->begin, block->target_start);
+            right = MIN(s->begin + s->length, block->target_end);
+            size = right - left;
+            size = size > 0 ? size : 0;
+        } else {
+            /* count the whole region in */
+            size = (block->target_end - block->target_start);
+        }
+        total += size;
+    }
+
+    return total;
+}
+
 static void dump_init(DumpState *s, int fd, bool has_format,
                       DumpGuestMemoryFormat format, bool paging, bool 
has_filter,
                       int64_t begin, int64_t length, Error **errp)
@@ -1431,6 +1458,7 @@ static void dump_init(DumpState *s, int fd, bool 
has_format,
 
     s->has_format = has_format;
     s->format = format;
+    s->written_size = 0;
 
     /* kdump-compressed is conflict with paging and filter */
     if (has_format && format != DUMP_GUEST_MEMORY_FORMAT_ELF) {
@@ -1462,6 +1490,10 @@ static void dump_init(DumpState *s, int fd, bool 
has_format,
 
     guest_phys_blocks_init(&s->guest_phys_blocks);
     guest_phys_blocks_append(&s->guest_phys_blocks);
+    s->total_size = dump_calculate_size(s);
+#ifdef DEBUG_DUMP_GUEST_MEMORY
+    fprintf(stderr, "DUMP: total memory to dump: %lu\n", s->total_size);
+#endif
 
     s->start = get_start_block(s);
     if (s->start == -1) {
@@ -1680,6 +1712,7 @@ static void dump_state_release(GlobalDumpState *global, 
bool done)
     assert(cur);
     global->gds_cur = NULL;
     if (done) {
+        assert(cur->total_size == cur->written_size);
         global->gds_result = DUMP_RES_SUCCEEDED;
     } else {
         global->gds_result = DUMP_RES_FAILED;
@@ -1710,9 +1743,6 @@ static void *dump_thread(void *data)
     dump_state_release(global, (local_err == NULL));
 
     /* if detach is used, notify user that dump has finished */
-    if (local_err) {
-        msg = error_get_pretty(local_err);
-    }
     qapi_event_send_dump_completed(msg, &error_abort);
     return NULL;
 }
diff --git a/include/sysemu/dump.h b/include/sysemu/dump.h
index 0f0a463..d7047ae 100644
--- a/include/sysemu/dump.h
+++ b/include/sysemu/dump.h
@@ -187,6 +187,15 @@ typedef struct DumpState {
     QemuThread dump_thread;     /* only used when do async dump */
     bool has_format;            /* whether format is provided */
     DumpGuestMemoryFormat format; /* valid only if has_format == true */
+
+    size_t total_size;          /* total memory size (in bytes) to
+                                 * be dumped. When filter is
+                                 * enabled, this will only count
+                                 * those to be written. */
+    size_t written_size;        /* written memory size (in bytes),
+                                 * this could be used to calculate
+                                 * how many work we have
+                                 * finished. */
 } DumpState;
 
 typedef enum DumpResult {
-- 
2.4.3