ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

memory: replace phys_page_find_alloc() with phys_page_set() 

By giving the function the value we want to set, we make it
more flexible for the next patch.

Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Avi Kivity 2012-02-13 17:19:30 +02:00
parent 0f0cb164cc
commit a391843286
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
exec.c
View File

@ -429,7 +429,7 @@ static void phys_map_nodes_reset(void)
phys_map_nodes_nb = 0; phys_map_nodes_nb = 0;
} }
static uint16_t *phys_page_find_alloc(target_phys_addr_t index, int alloc) static void phys_page_set(target_phys_addr_t index, uint16_t leaf)
{ {
PhysPageEntry *lp, *p; PhysPageEntry *lp, *p;
int i, j; int i, j;
@ -439,9 +439,6 @@ static uint16_t *phys_page_find_alloc(target_phys_addr_t index, int alloc)
/* Level 1..N. */ /* Level 1..N. */
for (i = P_L2_LEVELS - 1; i >= 0; i--) { for (i = P_L2_LEVELS - 1; i >= 0; i--) {
if (lp->u.node == PHYS_MAP_NODE_NIL) { if (lp->u.node == PHYS_MAP_NODE_NIL) {
if (!alloc) {
return NULL;
}
p = phys_map_node_alloc(&lp->u.node); p = phys_map_node_alloc(&lp->u.node);
if (i == 0) { if (i == 0) {
for (j = 0; j < L2_SIZE; j++) { for (j = 0; j < L2_SIZE; j++) {
@ -454,7 +451,7 @@ static uint16_t *phys_page_find_alloc(target_phys_addr_t index, int alloc)
lp = &p[(index >> (i * L2_BITS)) & (L2_SIZE - 1)]; lp = &p[(index >> (i * L2_BITS)) & (L2_SIZE - 1)];
} }
return &lp->u.leaf; lp->u.leaf = leaf;
} }
static MemoryRegionSection phys_page_find(target_phys_addr_t index) static MemoryRegionSection phys_page_find(target_phys_addr_t index)
@ -2611,7 +2608,6 @@ static void register_subpage(MemoryRegionSection *section)
.offset_within_address_space = base, .offset_within_address_space = base,
.size = TARGET_PAGE_SIZE, .size = TARGET_PAGE_SIZE,
}; };
uint16_t *ptr;
target_phys_addr_t start, end; target_phys_addr_t start, end;
assert(existing.mr->subpage || existing.mr == &io_mem_unassigned); assert(existing.mr->subpage || existing.mr == &io_mem_unassigned);
@ -2619,8 +2615,7 @@ static void register_subpage(MemoryRegionSection *section)
if (!(existing.mr->subpage)) { if (!(existing.mr->subpage)) {
subpage = subpage_init(base); subpage = subpage_init(base);
subsection.mr = &subpage->iomem; subsection.mr = &subpage->iomem;
ptr = phys_page_find_alloc(base >> TARGET_PAGE_BITS, 1); phys_page_set(base >> TARGET_PAGE_BITS, phys_section_add(&subsection));
*ptr = phys_section_add(&subsection);
} else { } else {
subpage = container_of(existing.mr, subpage_t, iomem); subpage = container_of(existing.mr, subpage_t, iomem);
} }
@ -2643,9 +2638,7 @@ static void register_multipage(MemoryRegionSection *section)
addr = start_addr; addr = start_addr;
do { do {
uint16_t *p = phys_page_find_alloc(addr >> TARGET_PAGE_BITS, 1); phys_page_set(addr >> TARGET_PAGE_BITS, section_index);
assert(*p == phys_section_unassigned);
*p = section_index;
addr += TARGET_PAGE_SIZE; addr += TARGET_PAGE_SIZE;
} while (addr != end_addr); } while (addr != end_addr);
} }