Merge commit '0e607a80d323ba9f46dee71cd07380c4eb5c2b0a' into upstream-merge

Merge commit '0e607a80d323ba9f46dee71cd07380c4eb5c2b0a' into upstream-merge

* commit '0e607a80d323ba9f46dee71cd07380c4eb5c2b0a': (22 commits)
  kvm: x86: Refactor use of interrupt_bitmap
  kvm: Add arch reset handler
  Enable migration without shared storage from the monitor
  Block live migration
  Expose a mechanism to trace block writes
  char: rename qemu_chr_reset to qemu_chr_generic_open
  char: Remove special init_reset handling
  char: don't limit data sent to backends to 1k per buffer
  ARM PB-A8 support
  LAN9118 emulation
  mips_r4k: fix reset
  PPC64: map Uni-North AGP bus aka fix Linux boot
  PPC64: Partial fix to Linux crash: revert to old devfn
  PCI: make duplicate devfn allocation fatal
  Do not execute shell scripts directly
  mips malta: fix indentation
  target-mips: fix indentation
  mips-malta: fix reset
  mips: fix cpu_reset memory leak
  fix make clean targets
  ...

Carry changes to qemu-kvm-x86.c.

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