openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

dump: add members to DumpState and init some of them 

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>
This commit is contained in:
qiaonuohan 2014-02-18 14:11:31 +08:00 committed by Luiz Capitulino
parent 607dacd0a0
commit 7aad248d35
2 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dump.c
View File

@ -79,6 +79,16 @@ typedef struct DumpState {
uint8_t *note_buf; /* buffer for notes */ uint8_t *note_buf; /* buffer for notes */
size_t note_buf_offset; /* the writing place in note_buf */ 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; } DumpState;
static int dump_cleanup(DumpState *s) static int dump_cleanup(DumpState *s)
@ -796,6 +806,14 @@ static ram_addr_t get_start_block(DumpState *s)
return -1; 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, static int dump_init(DumpState *s, int fd, bool paging, bool has_filter,
int64_t begin, int64_t length, Error **errp) int64_t begin, int64_t length, Error **errp)
{ {
@ -864,6 +882,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); 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) { if (s->has_filter) {
memory_mapping_filter(&s->list, s->begin, s->length); memory_mapping_filter(&s->list, s->begin, s->length);
} }

7
include/sysemu/dump.h
View File

@ -20,6 +20,13 @@
#define VERSION_FLAT_HEADER (1) /* version of flattened format */ #define VERSION_FLAT_HEADER (1) /* version of flattened format */
#define END_FLAG_FLAT_HEADER (-1) #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 { typedef struct ArchDumpInfo {
int d_machine; /* Architecture */ int d_machine; /* Architecture */
int d_endian; /* ELFDATA2LSB or ELFDATA2MSB */ int d_endian; /* ELFDATA2LSB or ELFDATA2MSB */