OSDN Git Service

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)
* qmp/queue/qmp:
  qapi: convert device_del
  qdev: qdev_unplug(): use error_set()

1  2 
hw/qdev.h

diff --cc hw/qdev.h
Simple merge