From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51420) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WmiOy-0004QJ-8n for qemu-devel@nongnu.org; Tue, 20 May 2014 07:40:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WmiOs-00080T-1b for qemu-devel@nongnu.org; Tue, 20 May 2014 07:40:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48890) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WmiOr-0007wK-R1 for qemu-devel@nongnu.org; Tue, 20 May 2014 07:40:05 -0400 From: Laszlo Ersek Date: Tue, 20 May 2014 13:39:43 +0200 Message-Id: <1400585987-6285-4-git-send-email-lersek@redhat.com> In-Reply-To: <1400585987-6285-1-git-send-email-lersek@redhat.com> References: <1400585987-6285-1-git-send-email-lersek@redhat.com> Subject: [Qemu-devel] [PATCH 3/7] dump: eliminate DumpState.page_shift ("guest's page shift") List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Luiz Capitulino , Qiao Nuohan , Paolo Bonzini , Ekaterina Tumanova , Christian Borntraeger , "Aneesh Kumar K.V" 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 Signed-off-by: Laszlo Ersek --- include/sysemu/dump.h | 8 ++++---- dump.c | 10 ++++------ 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/include/sysemu/dump.h b/include/sysemu/dump.h index efab7a3..12af557 100644 --- a/include/sysemu/dump.h +++ b/include/sysemu/dump.h @@ -20,14 +20,14 @@ #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)) +#define paddr_to_pfn(X) \ + (((unsigned long long)(X) >> TARGET_PAGE_BITS) - ARCH_PFN_OFFSET) +#define pfn_to_paddr(X) \ + (((unsigned long long)(X) + ARCH_PFN_OFFSET) << TARGET_PAGE_BITS) /* * flag for compressed format */ #define DUMP_DH_COMPRESSED_ZLIB (0x1) diff --git a/dump.c b/dump.c index 6dec8d2..cde14d9 100644 --- a/dump.c +++ b/dump.c @@ -89,11 +89,10 @@ 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 */ @@ -1084,19 +1083,19 @@ static bool get_next_page(GuestPhysBlock **blockptr, uint64_t *pfnptr, if (!block) { block = QTAILQ_FIRST(&s->guest_phys_blocks.head); *blockptr = block; assert(block->target_start % 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) { *bufptr = block->host_addr; } return true; } *pfnptr = *pfnptr + 1; - addr = pfn_to_paddr(*pfnptr, s->page_shift); + addr = pfn_to_paddr(*pfnptr); if ((addr >= block->target_start) && (addr + s->page_size <= block->target_end)) { buf = block->host_addr + (addr - block->target_start); } else { @@ -1106,11 +1105,11 @@ static bool get_next_page(GuestPhysBlock **blockptr, uint64_t *pfnptr, if (!block) { return false; } assert(block->target_start % 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; } if (bufptr) { *bufptr = buf; @@ -1532,11 +1531,11 @@ static ram_addr_t get_start_block(DumpState *s) 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); + s->max_mapnr = paddr_to_pfn(last_block->target_end); } static int dump_init(DumpState *s, int fd, bool has_format, DumpGuestMemoryFormat format, bool paging, bool has_filter, int64_t begin, int64_t length, Error **errp) @@ -1610,11 +1609,10 @@ static int dump_init(DumpState *s, int fd, bool has_format, 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); -- 1.8.3.1