]> git.proxmox.com Git - qemu.git/commitdiff
Merge remote-tracking branch 'qmp/queue/qmp' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 8 May 2012 18:07:41 +0000 (13:07 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 8 May 2012 18:07:41 +0000 (13:07 -0500)
* qmp/queue/qmp:
  hmp: fix bad value conversion for M type
  hmp: expr_unary(): check for overflow in strtoul()/strtoull()
  vl: drop is_suspended variable
  runstate: introduce suspended state
  qapi-schema.json: fix RunState enums alphabetical order
  wakeup on migration


Trivial merge