aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAlexey Kardashevskiy <aik@ozlabs.ru>2014-01-30 23:03:50 +1100
committerJuan Quintela <quintela@redhat.com>2014-02-04 16:45:22 +0100
commitf9ee9f9ac28d6964772c08d5d428b713d58a3aca (patch)
tree8fd622f4fc71dfc271fe68fb5588e44cef37e2b6 /include
parent20bcf73fa80c3477b6aaf5f39f18f031ff55de92 (diff)
downloadqemu-f9ee9f9ac28d6964772c08d5d428b713d58a3aca.zip
qemu-f9ee9f9ac28d6964772c08d5d428b713d58a3aca.tar.gz
qemu-f9ee9f9ac28d6964772c08d5d428b713d58a3aca.tar.bz2
exec: fix ram_list dirty map optimization
The ae2810c4bb3b383176e8e1b33931b16c01483aab patch introduced optimization for ram_list.dirty_memory update. However it can only work correctly if hpratio is 1 as the @bitmap parameter stores 1 bits per system page size (may vary, 4K or 64K on PPC64) and ram_list.dirty_memory stores 1 bit per TARGET_PAGE_SIZE (which is hardcoded to 4K). This fixes hpratio!=1 case to fall back to the slow path. Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> Signed-off-by: Juan Quintela <quintela@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/exec/ram_addr.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h
index 481a447..2edfa96 100644
--- a/include/exec/ram_addr.h
+++ b/include/exec/ram_addr.h
@@ -93,7 +93,8 @@ static inline void cpu_physical_memory_set_dirty_lebitmap(unsigned long *bitmap,
unsigned long page = BIT_WORD(start >> TARGET_PAGE_BITS);
/* start address is aligned at the start of a word? */
- if (((page * BITS_PER_LONG) << TARGET_PAGE_BITS) == start) {
+ if ((((page * BITS_PER_LONG) << TARGET_PAGE_BITS) == start) &&
+ (hpratio == 1)) {
long k;
long nr = BITS_TO_LONGS(pages);