]> git.proxmox.com Git - qemu.git/commit
projects / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 01f590d 29ed72f)
Merge branch 'queue/qmp' of git://repo.or.cz/qemu/qmp-unstable
authorAurelien Jarno <aurelien@aurel32.net>
Mon, 29 Oct 2012 13:55:51 +0000 (14:55 +0100)
committerAurelien Jarno <aurelien@aurel32.net>
Mon, 29 Oct 2012 13:55:51 +0000 (14:55 +0100)
commit3f4331bfd112840e94935b0fd098ee88c07beabc
tree36fd14200ceb2b73832191ae03311bcf9bd0886ctree
parent01f590d5a3385c3d79c6afda7acd66edf4bf48d3commit | diff
parent29ed72f15a4c8fd3ac106d874f76cc27b654fd25commit | diff
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
migration.c diff1 | diff2 | blob | history
qapi-schema.json diff1 | diff2 | blob | history
qerror.h diff1 | diff2 | blob | history
qmp.c diff1 | diff2 | blob | history
vl.c diff1 | diff2 | blob | history
Qemu copy for testing