Merge branch 'upstream-merge'

Merge branch 'upstream-merge'

* upstream-merge:
  Fix Sparse warning
  Work around Solaris gas problem
  Rename target_cpu to target_arch2
  monitor: Fix typo in documentation
  target-mips: fix MADD and MSUB/MSUBU instructions
  Fix hxtool.
  Use ctz64 in favor of ffsll
  Respect the standard
  Use pstrcpy and pstrcat to avoid OpenBSD linker warning
  Suppress a GCC warning
  Fix breakage by obsolete _P() for good
  Fix sdl_zoom compile problems on OpenBSD
  Fix missing strnlen problems
  Fix typo
  Remove bogus -Werror

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