Merge commit 'd745bef890f9fa57298ae099365da8e8aa575cbd' into upstream-merge

* commit 'd745bef890f9fa57298ae099365da8e8aa575cbd': (35 commits)
  Move KVM and Xen global flags to vl.c
  Move cpu_exec_init_all() declaration to qemu-common.h
  Allow various header files to be included from non-CPU code
  Adjust debug handling
  tcg/mips: fix branch offset during retranslation
  exec: remove dead code
  linux-user/ppc: use the Linux register layout
  qemu-io: fix aio help texts
  tcg/arm: Replace qemu_ld32u (left over from previous commit)
  Fix driftfix option
  Fix BSD and win32 builds
  Refactor numa mode setting
  pflash_cfi02: fix incorrect TARGET_FMT_lx/d use
  Compile vmware_vga only once
  tcg-mips: add guest base support
  tcg/mips: implement the not_i32 op the same way as gcc
  tcg-mips: implement nor
  be more specific in -mem-path error messages
  Add a missing #include for FreeBSD hosts
  error: Move qerror_report() from qemu-error.[ch] to qerror.[ch]
  ...

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

1 files changed, 2 insertions, 3 deletions

diff --git a/exec.c b/exec.c
index 7f5c5158a..5f22da09c 100644
--- a/exec.c
+++ b/exec.c
@@ -1193,7 +1193,6 @@ static inline void tb_alloc_page(TranslationBlock *tb,
                 continue;
             prot |= p2->flags;
             p2->flags &= ~PAGE_WRITE;
-            page_get_flags(addr);
           }
         mprotect(g2h(page_addr), qemu_host_page_size,
                  (prot & PAGE_BITS) & ~PAGE_WRITE);
@@ -2684,7 +2683,7 @@ static long gethugepagesize(const char *path)
     } while (ret != 0 && errno == EINTR);
 
     if (ret != 0) {
-	    perror("statfs");
+	    perror(path);
 	    return 0;
     }
 
@@ -2724,7 +2723,7 @@ static void *file_ram_alloc(ram_addr_t memory, const char *path)
 
     fd = mkstemp(filename);
     if (fd < 0) {
-	perror("mkstemp");
+	perror("unable to create backing store for hugepages");
 	free(filename);
 	return NULL;
     }