From 8636b9295be46307a1de86942accabea50fa59ae Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Sun, 12 Feb 2012 21:10:50 +0200 Subject: memory: fix RAM subpages in newly initialized pages If the first subpage installed in a page is RAM, then we install it as a full page, instead of a subpage. Fix by not special casing RAM. The issue dates to commit db7b5426a4b4242, which introduced subpages. Signed-off-by: Avi Kivity --- exec.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'exec.c') diff --git a/exec.c b/exec.c index 0756919e6..5d0afdbde 100644 --- a/exec.c +++ b/exec.c @@ -2660,22 +2660,20 @@ void cpu_register_physical_memory_log(MemoryRegionSection *section, *p = section_index; } } else { - MemoryRegion *mr = section->mr; + target_phys_addr_t start_addr2, end_addr2; + int need_subpage = 0; + p = phys_page_find_alloc(addr >> TARGET_PAGE_BITS, 1); *p = section_index; - if (!(memory_region_is_ram(mr) || mr->rom_device)) { - target_phys_addr_t start_addr2, end_addr2; - int need_subpage = 0; - CHECK_SUBPAGE(addr, start_addr, start_addr2, end_addr, - end_addr2, need_subpage); + CHECK_SUBPAGE(addr, start_addr, start_addr2, end_addr, + end_addr2, need_subpage); - if (need_subpage) { - subpage = subpage_init((addr & TARGET_PAGE_MASK), - p, phys_section_unassigned); - subpage_register(subpage, start_addr2, end_addr2, - section_index); - } + if (need_subpage) { + subpage = subpage_init((addr & TARGET_PAGE_MASK), + p, phys_section_unassigned); + subpage_register(subpage, start_addr2, end_addr2, + section_index); } } addr += TARGET_PAGE_SIZE; -- cgit v1.2.3