mirror of
https://github.com/qemu/qemu.git
synced 2024-11-23 19:03:38 +08:00
Fix unassigned region offsets.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6639 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
cc53adbca0
commit
67c4d23c4f
9
exec.c
9
exec.c
@ -368,8 +368,10 @@ static PhysPageDesc *phys_page_find_alloc(target_phys_addr_t index, int alloc)
|
||||
return NULL;
|
||||
pd = qemu_vmalloc(sizeof(PhysPageDesc) * L2_SIZE);
|
||||
*lp = pd;
|
||||
for (i = 0; i < L2_SIZE; i++)
|
||||
for (i = 0; i < L2_SIZE; i++) {
|
||||
pd[i].phys_offset = IO_MEM_UNASSIGNED;
|
||||
pd[i].region_offset = (index + i) << TARGET_PAGE_BITS;
|
||||
}
|
||||
}
|
||||
return ((PhysPageDesc *)pd) + (index & (L2_SIZE - 1));
|
||||
}
|
||||
@ -2280,6 +2282,9 @@ void cpu_register_physical_memory_offset(target_phys_addr_t start_addr,
|
||||
if (kvm_enabled())
|
||||
kvm_set_phys_mem(start_addr, size, phys_offset);
|
||||
|
||||
if (phys_offset == IO_MEM_UNASSIGNED) {
|
||||
region_offset = start_addr;
|
||||
}
|
||||
region_offset &= TARGET_PAGE_MASK;
|
||||
size = (size + TARGET_PAGE_SIZE - 1) & TARGET_PAGE_MASK;
|
||||
end_addr = start_addr + (target_phys_addr_t)size;
|
||||
@ -2327,7 +2332,7 @@ void cpu_register_physical_memory_offset(target_phys_addr_t start_addr,
|
||||
if (need_subpage || phys_offset & IO_MEM_SUBWIDTH) {
|
||||
subpage = subpage_init((addr & TARGET_PAGE_MASK),
|
||||
&p->phys_offset, IO_MEM_UNASSIGNED,
|
||||
0);
|
||||
addr & TARGET_PAGE_MASK);
|
||||
subpage_register(subpage, start_addr2, end_addr2,
|
||||
phys_offset, region_offset);
|
||||
p->region_offset = 0;
|
||||
|
Loading…
Reference in New Issue
Block a user