Merge commit 'c902760fb25f9c490af01e8f6bccaa8dd71cc224' into upstream-merge

Merge commit 'c902760fb25f9c490af01e8f6bccaa8dd71cc224' into upstream-merge

* commit 'c902760fb25f9c490af01e8f6bccaa8dd71cc224': (21 commits)
  Add option to use file backed guest memory
  Allocate memory below 4GB as one chunk
  (curses) Use more descriptive values
  Fix curses return key when using -k
  target-mips: use setcond when possible
  tcg/arm: merge the two sets of #define for optional ops
  tcg/arm: accept immediate arguments for brcond/setcond
  Add a missing break
  tcg/arm: implement setcond2
  tcg/arm: implement setcond
  tcg/arm: fix div2/divu2
  Avoid tlb_set_page in userspace emulation
  Move subpage definitions
  Disassembler symbol lookup fix
  Move ioport.h out of cpu-all.h
  Remove bogus cpu_physical_memory_rw
  Remove l1_phys_map from userspace emulation
  Fix userspace breakpoint invalidation
  target-arm: neon vshll instruction fix
  target-arm: neon - fix VRADDHN/VRSUBHN vs VADDHN/VSUBHN
  ...

Conflicts:
	exec.c

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