Merge commit '600309b6108484a60be4a84cfe68e6b8d645799c' into upstream-merge
commitae00eadddf49f3389516fcf7fc79325da4d7d08d
authorAvi Kivity <avi@redhat.com>
Sun, 5 Jul 2009 17:09:26 +0000 (5 20:09 +0300)
committerAvi Kivity <avi@redhat.com>
Sun, 5 Jul 2009 17:09:26 +0000 (5 20:09 +0300)
tree379bb27a421494d729d0d845758ca6cdef93bdc7
parente3d40136a1e3f97b3828e5a4c147487fc5d7aeda
parent600309b6108484a60be4a84cfe68e6b8d645799c
Merge commit '600309b6108484a60be4a84cfe68e6b8d645799c' into upstream-merge

* commit '600309b6108484a60be4a84cfe68e6b8d645799c':
  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

Conflicts:
configure

Signed-off-by: Avi Kivity <avi@redhat.com>
Makefile
Makefile.target
block.c
configure
cutils.c
net.c
qemu-common.h
qemu-monitor.hx
target-i386/helper.c
target-i386/machine.c