mii/qemu
1
0
Fork 0
mirror of https://github.com/mii443/qemu.git synced 2025-12-16 17:18:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'stefanha/trivial-patches' into staging

Browse Source
This commit is contained in:
Anthony Liguori
2011-06-27 11:25:23 -05:00
parent 2fb0c09f4f 20fa53ece4
commit bb820c03e2
30 changed files with 117 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
exec.c
View File

@@ -1207,12 +1207,16 @@ static inline void tb_alloc_page(TranslationBlock *tb,
unsigned int n, tb_page_addr_t page_addr)
{
PageDesc *p;
TranslationBlock *last_first_tb;
#ifndef CONFIG_USER_ONLY
bool page_already_protected;
#endif
tb->page_addr[n] = page_addr;
p = page_find_alloc(page_addr >> TARGET_PAGE_BITS, 1);
tb->page_next[n] = p->first_tb;
last_first_tb = p->first_tb;
#ifndef CONFIG_USER_ONLY
page_already_protected = p->first_tb != NULL;
#endif
p->first_tb = (TranslationBlock *)((long)tb | n);
invalidate_page_bitmap(p);
@@ -1248,7 +1252,7 @@ static inline void tb_alloc_page(TranslationBlock *tb,
/* if some code is already present, then the pages are already
protected. So we handle the case where only the first TB is
allocated in a physical page */
if (!last_first_tb) {
if (!page_already_protected) {
tlb_protect_code(page_addr);
}
#endif