Merge branch 'master' of git://git.sv.gnu.org/qemu

Merge branch 'master' of git://git.sv.gnu.org/qemu

* 'master' of git://git.sv.gnu.org/qemu: (58 commits)
  exec.c: remove unnecessary #if NB_MMU_MODES
  Fix vga_screen_dump_blank() PPM generation
  Prevent CD-ROM media eject while device is locked
  set migration max downtime
  add non-arbitrary migration stop condition
  kvm: Fix IRQ injection into full queue
  Call qemu_bh_delete at bdrv_aio_bh_cb.
  Remove dead code
  QEMU KVM: i386: Fix the cpu reset state
  allow CPUID vendor override
  Fix help message for new configure option --enable-debug.
  provide cpu_index to env mapping
  pci: add define for communication class devices
  vnc: improve numpad support for qemu console.
  virtio blk: fix warning.
  lsi53c895a: Implement write access to DMA Byte Counter
  lsi53c895a: Implement read and write access to DMA Next Address
  lsi53c895a: Implement Scratch Byte Register
  Rename pci_register_io_region() to pci_register_bar()
  Rearrange io_mem_init()
  ...

Conflicts:
	configure

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