]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'qmp/queue/qmp' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 10 Apr 2012 13:17:36 +0000 (08:17 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 10 Apr 2012 13:17:36 +0000 (08:17 -0500)
commit6da25bd5e8355230b9562417e386728c31783002
tree5ecc4214c74891c7e417ecfe184c721f76bdf95e
parentbb5d8dd757eaa8f9a048c5205c69bed20ea373d1
parenta15fef21c746e3aa0a94cf7b5bd9799886236666
Merge remote-tracking branch 'qmp/queue/qmp' into staging

* qmp/queue/qmp:
  qapi: convert device_del
  qdev: qdev_unplug(): use error_set()
hw/qdev.h