Merge commit 'a88790a14f60ac966a2103a958c3febf5a42836b' into upstream-merge
commitadb2e06d39fb2ee32ec6221f46ccdb37a7963d61
authorMarcelo Tosatti <mtosatti@redhat.com>
Sun, 4 Jul 2010 10:54:19 +0000 (4 07:54 -0300)
committerMarcelo Tosatti <mtosatti@redhat.com>
Sun, 4 Jul 2010 10:54:19 +0000 (4 07:54 -0300)
treee65733a49b5e40c3347ba460d11ab63d5a453199
parentd2516d31c32fe7c8a1dcebeba68eb534e74f8323
parenta88790a14f60ac966a2103a958c3febf5a42836b
Merge commit 'a88790a14f60ac966a2103a958c3febf5a42836b' into upstream-merge

* commit 'a88790a14f60ac966a2103a958c3febf5a42836b': (49 commits)
  remove exec-all.h inclusion from cpu.h
  move cpu_pc_from_tb to target-*/exec.h
  remove unused stuff from */exec.h
  Don't declare XSAVE as supported
  Add more boundary checking to sse3/4 parsing
  target-arm : fix parallel saturated subtraction implementation
  target-arm : fix thumb2 parallel add/sub opcode decoding
  target-arm: fix addsub/subadd implementation
  Makefile: add qemu-options.def to distclean
  Add QMP/qmp-commands.txt to .gitignore
  target-i386: fix xchg rax,r8
  target-mips: add Loongson support prefetch
  target-mips: split load and store
  qdev-properties: Fix (u)intXX parsers
  Return usb device to host on exit
  Return usb device to host on usb_del command
  net: Fix VM start with '-net none'
  x86: svm: Always clear event_inj on vmexit
  usb-uhci: fix commit 8e65b7c04965c8355e4ce43211582b6b83054e3d for vmstate
  hw/omap : make local function static and remove declaration from header
  ...

Conflicts:
monitor.c

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
12 files changed:
.gitignore
Makefile
Makefile.objs
Makefile.target
configure
exec.c
gdbstub.c
monitor.c
target-i386/cpu.h
target-i386/cpuid.c
target-i386/kvm.c
target-ppc/cpu.h