Merge branch 'upstream-merge'

Merge branch 'upstream-merge'

* upstream-merge: (24 commits)
  mips-dis: Add missing static attributes
  tcg: Add missing 'static' attribute
  qcow2: Remove static forward declaration
  Revert "Fix OpenBSD build"
  Fill in unassigned mem read/write callbacks.
  darwin-user: Add missing static attribute
  Add missing 'static' attribute
  sparc64: fix build with older gccs
  sparc64: handle asi referencing nucleus and secondary MMU contexts
  sparc64: implement global translation table entries v1
  sparc64: more ultrasparc asi extensions for disassembler
  qemu: address todo comment in exec.c
  Fix zero-length write(2).
  Better default guest_base
  Remove PAGE_RESERVED
  Avoid libaio for usermode
  Enable -d cpu logging by default.
  target-sh4: Remove duplicate CPU log.
  target-ppc: Remove duplicate cpu log.
  target-mips: Remove duplicate CPU log.
  ...

Signed-off-by: Avi Kivity <avi@redhat.com>