Merge branch 'queue/qmp' of git://repo.or.cz/qemu/qmp-unstable

* 'queue/qmp' of git://repo.or.cz/qemu/qmp-unstable:
  migration: go to paused state after finishing incoming migration with -S
  qmp: handle stop/cont in INMIGRATE state
  hmp: fix info cpus for sparc targets

diff --cc migration.c
Simple merge

diff --cc qapi-schema.json
Simple merge

diff --cc qerror.h
Simple merge

diff --cc qmp.c
Simple merge

diff --cc vl.c
Simple merge