tree 36fd14200ceb2b73832191ae03311bcf9bd0886c
parent 01f590d5a3385c3d79c6afda7acd66edf4bf48d3
parent 29ed72f15a4c8fd3ac106d874f76cc27b654fd25
author Aurelien Jarno <aurelien@aurel32.net> 1351518951 +0100
committer Aurelien Jarno <aurelien@aurel32.net> 1351518951 +0100

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