Merge branch 'upstream-merge'
commitd4adede84de96d631f2c6eff2c01eae00b14a110
authorMarcelo Tosatti <mtosatti@redhat.com>
Sun, 4 Jul 2010 10:56:11 +0000 (4 07:56 -0300)
committerMarcelo Tosatti <mtosatti@redhat.com>
Sun, 4 Jul 2010 10:56:11 +0000 (4 07:56 -0300)
tree463cd0168c61418eba5f6df6d53b4d175168ddbd
parentbd468e1695195168ac31fbe4dee36d0ccd4b713c
parent2542787badf8371c4f1cf4545bfe4df01d51c5ae
Merge branch 'upstream-merge'

* upstream-merge: (95 commits)
  piix4: compile only once
  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
  ...

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>