| Message ID | 4d014871a007ddf2a7da0fe1b1a1647b6ad887cf.1307014902.git.quintela@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 2 June 2011 12:53, Juan Quintela <quintela@redhat.com> wrote: > Once there, use a better variable name. > > Signed-off-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> > --- > exec.c | 10 +++++++--- > 1 files changed, 7 insertions(+), 3 deletions(-) > > diff --git a/exec.c b/exec.c > index 8529390..4b1afec 100644 > --- a/exec.c > +++ b/exec.c > @@ -1208,12 +1208,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); > > @@ -1249,7 +1253,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 > -- > 1.7.5.2 > > >
On Thu, Jun 02, 2011 at 01:53:44PM +0200, Juan Quintela wrote: > Once there, use a better variable name. > > Signed-off-by: Juan Quintela <quintela@redhat.com> > --- > exec.c | 10 +++++++--- > 1 files changed, 7 insertions(+), 3 deletions(-) Thanks, applied to the trivial patches tree: http://repo.or.cz/w/qemu/stefanha.git/shortlog/refs/heads/trivial-patches Stefan
diff --git a/exec.c b/exec.c index 8529390..4b1afec 100644 --- a/exec.c +++ b/exec.c @@ -1208,12 +1208,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); @@ -1249,7 +1253,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
Once there, use a better variable name. Signed-off-by: Juan Quintela <quintela@redhat.com> --- exec.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-)