Merge commit '79c4f6b08009a1d23177c2be8bd003253cf3686a' into upstream-merge
commit18b29b17a8a6d681f1a29abba0706d0dbec51e33
authorAvi Kivity <avi@redhat.com>
Sun, 12 Jul 2009 15:01:47 +0000 (12 18:01 +0300)
committerAvi Kivity <avi@redhat.com>
Sun, 12 Jul 2009 15:01:47 +0000 (12 18:01 +0300)
tree33a583b38a415fedf23680178381cc8a32089f22
parentea4e29cd3f85cc4e136954b340486cb03b2fca9c
parent79c4f6b08009a1d23177c2be8bd003253cf3686a
Merge commit '79c4f6b08009a1d23177c2be8bd003253cf3686a' into upstream-merge

* commit '79c4f6b08009a1d23177c2be8bd003253cf3686a':
  QEMU: MCE: Add MCE simulation to qemu/tcg
  getrlimit conversion mix-up
  wrap path for access syscall
  64-bit clean socketcall syscall
  pipe argument should not be signed
  configure: remove bogus linux-user check
  linux-user/syscall.c: remove warning: ‘array’ may be used uninitialized in this function
  linux-user: check some parameters for some socket syscalls.
  linux-user: increment MAX_ARG_PAGES

Conflicts:
qemu-monitor.hx

Signed-off-by: Avi Kivity <avi@redhat.com>
configure
cpu-all.h
cpu-exec.c
monitor.c
qemu-monitor.hx
target-i386/helper.c
target-i386/machine.c