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

memory: fix RAM subpages in newly initialized pages

Browse Source 
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 db7b5426a4, which introduced subpages.

Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Avi Kivity 2012-02-12 21:10:50 +02:00
parent d6f2ea22a0
commit 8636b9295b
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
exec.c
View File

@ -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;