From 1f333717698aecbd70732d4dac609db8eda895d5 Mon Sep 17 00:00:00 2001

From: Laszlo Ersek <lersek@redhat.com>

Date: Fri, 7 Nov 2014 17:17:57 +0100

Subject: [PATCH 10/41] dump: add members to DumpState and init some of them

Message-id: <1415380693-16593-11-git-send-email-lersek@redhat.com>

Patchwork-id: 62196

O-Subject: [RHEL-7.1 qemu-kvm PATCH 10/26] dump: add members to DumpState and init some of them

Bugzilla: 1157798

RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>

RH-Acked-by: Luiz Capitulino <lcapitulino@redhat.com>

RH-Acked-by: dgibson <dgibson@redhat.com>

From: qiaonuohan <qiaonuohan@cn.fujitsu.com>

add some members to DumpState that will be used in writing vmcore in

kdump-compressed format. some of them, like page_size, will be initialized

in the patch.

Signed-off-by: Qiao Nuohan <qiaonuohan@cn.fujitsu.com>

Reviewed-by: Laszlo Ersek <lersek@redhat.com>

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>

(cherry picked from commit 7aad248d3596a1fb94778f2cd215f86a802b3abb)

Signed-off-by: Laszlo Ersek <lersek@redhat.com>

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 dump.c                | 28 ++++++++++++++++++++++++++++

 include/sysemu/dump.h |  7 +++++++

 2 files changed, 35 insertions(+)

diff --git a/dump.c b/dump.c

index 3c6d526..88e8cc0 100644

--- a/dump.c

+++ b/dump.c

@@ -79,6 +79,16 @@ typedef struct DumpState {

     uint8_t *note_buf;          /* buffer for notes */

     size_t note_buf_offset;     /* the writing place in note_buf */

+    uint32_t nr_cpus;           /* number of guest's cpu */

+    size_t page_size;           /* guest's page size */

+    uint32_t page_shift;        /* guest's page shift */

+    uint64_t max_mapnr;         /* the biggest guest's phys-mem's number */

+    size_t len_dump_bitmap;     /* the size of the place used to store

+                                   dump_bitmap in vmcore */

+    off_t offset_dump_bitmap;   /* offset of dump_bitmap part in vmcore */

+    off_t offset_page;          /* offset of page part in vmcore */

+    size_t num_dumpable;        /* number of page that can be dumped */

+    uint32_t flag_compress;     /* indicate the compression format */

 } DumpState;

 static int dump_cleanup(DumpState *s)

@@ -802,6 +812,14 @@ static ram_addr_t get_start_block(DumpState *s)

     return -1;

 }

+static void get_max_mapnr(DumpState *s)

+{

+    GuestPhysBlock *last_block;

+

+    last_block = QTAILQ_LAST(&s->guest_phys_blocks.head, GuestPhysBlockHead);

+    s->max_mapnr = paddr_to_pfn(last_block->target_end, s->page_shift);

+}

+

 static int dump_init(DumpState *s, int fd, bool paging, bool has_filter,

                      int64_t begin, int64_t length, Error **errp)

 {

@@ -870,6 +888,16 @@ static int dump_init(DumpState *s, int fd, bool paging, bool has_filter,

         qemu_get_guest_simple_memory_mapping(&s->list, &s->guest_phys_blocks);

     }

+    s->nr_cpus = nr_cpus;

+    s->page_size = TARGET_PAGE_SIZE;

+    s->page_shift = ffs(s->page_size) - 1;

+

+    get_max_mapnr(s);

+

+    uint64_t tmp;

+    tmp = DIV_ROUND_UP(DIV_ROUND_UP(s->max_mapnr, CHAR_BIT), s->page_size);

+    s->len_dump_bitmap = tmp * s->page_size;

+

     if (s->has_filter) {

         memory_mapping_filter(&s->list, s->begin, s->length);

     }

diff --git a/include/sysemu/dump.h b/include/sysemu/dump.h

index b32b390..995bf47 100644

--- a/include/sysemu/dump.h

+++ b/include/sysemu/dump.h

@@ -20,6 +20,13 @@

 #define VERSION_FLAT_HEADER         (1)    /* version of flattened format */

 #define END_FLAG_FLAT_HEADER        (-1)

+#define ARCH_PFN_OFFSET             (0)

+

+#define paddr_to_pfn(X, page_shift) \

+    (((unsigned long long)(X) >> (page_shift)) - ARCH_PFN_OFFSET)

+#define pfn_to_paddr(X, page_shift) \

+    (((unsigned long long)(X) + ARCH_PFN_OFFSET) << (page_shift))

+

 typedef struct ArchDumpInfo {

     int d_machine;  /* Architecture */

     int d_endian;   /* ELFDATA2LSB or ELFDATA2MSB */

-- 

1.8.3.1