mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dump: eliminate DumpState.page_shift ("guest's page shift")

Browse Source 
Just use TARGET_PAGE_BITS.

"DumpState.page_shift" used to have type "uint32_t", while the replacement
TARGET_PAGE_BITS has type "int". Since "DumpState.page_shift" was only
used as bit shift counts in the paddr_to_pfn() and pfn_to_paddr() macros,
this is safe.

Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
Laszlo Ersek 2014-05-20 13:39:43 +02:00 committed by Luiz Capitulino
parent 92ba1401e0
commit 22227f121b
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dump.c
View File

@ -91,7 +91,6 @@ typedef struct DumpState {
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 */ uint32_t nr_cpus; /* number of guest's cpu */
size_t page_size; /* guest's page size */ 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 */ 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 size_t len_dump_bitmap; /* the size of the place used to store
dump_bitmap in vmcore */ dump_bitmap in vmcore */
@ -1086,7 +1085,7 @@ static bool get_next_page(GuestPhysBlock **blockptr, uint64_t *pfnptr,
*blockptr = block; *blockptr = block;
assert(block->target_start % s->page_size == 0); assert(block->target_start % s->page_size == 0);
assert(block->target_end % s->page_size == 0); assert(block->target_end % s->page_size == 0);
*pfnptr = paddr_to_pfn(block->target_start, s->page_shift); *pfnptr = paddr_to_pfn(block->target_start);
if (bufptr) { if (bufptr) {
*bufptr = block->host_addr; *bufptr = block->host_addr;
} }
@ -1094,7 +1093,7 @@ static bool get_next_page(GuestPhysBlock **blockptr, uint64_t *pfnptr,
} }
*pfnptr = *pfnptr + 1; *pfnptr = *pfnptr + 1;
addr = pfn_to_paddr(*pfnptr, s->page_shift); addr = pfn_to_paddr(*pfnptr);
if ((addr >= block->target_start) && if ((addr >= block->target_start) &&
(addr + s->page_size <= block->target_end)) { (addr + s->page_size <= block->target_end)) {
@ -1108,7 +1107,7 @@ static bool get_next_page(GuestPhysBlock **blockptr, uint64_t *pfnptr,
} }
assert(block->target_start % s->page_size == 0); assert(block->target_start % s->page_size == 0);
assert(block->target_end % s->page_size == 0); assert(block->target_end % s->page_size == 0);
*pfnptr = paddr_to_pfn(block->target_start, s->page_shift); *pfnptr = paddr_to_pfn(block->target_start);
buf = block->host_addr; buf = block->host_addr;
} }
@ -1534,7 +1533,7 @@ static void get_max_mapnr(DumpState *s)
GuestPhysBlock *last_block; GuestPhysBlock *last_block;
last_block = QTAILQ_LAST(&s->guest_phys_blocks.head, GuestPhysBlockHead); last_block = QTAILQ_LAST(&s->guest_phys_blocks.head, GuestPhysBlockHead);
s->max_mapnr = paddr_to_pfn(last_block->target_end, s->page_shift); s->max_mapnr = paddr_to_pfn(last_block->target_end);
} }
static int dump_init(DumpState *s, int fd, bool has_format, static int dump_init(DumpState *s, int fd, bool has_format,
@ -1612,7 +1611,6 @@ static int dump_init(DumpState *s, int fd, bool has_format,
s->nr_cpus = nr_cpus; s->nr_cpus = nr_cpus;
s->page_size = TARGET_PAGE_SIZE; s->page_size = TARGET_PAGE_SIZE;
s->page_shift = ffs(s->page_size) - 1;
get_max_mapnr(s); get_max_mapnr(s);

8
include/sysemu/dump.h
View File

@ -22,10 +22,10 @@
#define ARCH_PFN_OFFSET (0) #define ARCH_PFN_OFFSET (0)
#define paddr_to_pfn(X, page_shift) \ #define paddr_to_pfn(X) \
(((unsigned long long)(X) >> (page_shift)) - ARCH_PFN_OFFSET) (((unsigned long long)(X) >> TARGET_PAGE_BITS) - ARCH_PFN_OFFSET)
#define pfn_to_paddr(X, page_shift) \ #define pfn_to_paddr(X) \
(((unsigned long long)(X) + ARCH_PFN_OFFSET) << (page_shift)) (((unsigned long long)(X) + ARCH_PFN_OFFSET) << TARGET_PAGE_BITS)
/* /*
* flag for compressed format * flag for compressed format