diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-04-10 08:17:36 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-04-10 08:17:36 -0500 |
| commit | 6da25bd5e8355230b9562417e386728c31783002 (patch) | |
| tree | 5ecc4214c74891c7e417ecfe184c721f76bdf95e /hw/qdev.h | |
| parent | bb5d8dd757eaa8f9a048c5205c69bed20ea373d1 (diff) | |
| parent | a15fef21c746e3aa0a94cf7b5bd9799886236666 (diff) | |
| download | focaccia-qemu-6da25bd5e8355230b9562417e386728c31783002.tar.gz focaccia-qemu-6da25bd5e8355230b9562417e386728c31783002.zip | |
Merge remote-tracking branch 'qmp/queue/qmp' into staging
* qmp/queue/qmp: qapi: convert device_del qdev: qdev_unplug(): use error_set()
Diffstat (limited to 'hw/qdev.h')
| -rw-r--r-- | hw/qdev.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/qdev.h b/hw/qdev.h index 1c109607b4..4e90119471 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -7,6 +7,7 @@ #include "qemu-option.h" #include "qapi/qapi-visit-core.h" #include "qemu/object.h" +#include "error.h" typedef struct Property Property; @@ -148,7 +149,7 @@ int qdev_init(DeviceState *dev) QEMU_WARN_UNUSED_RESULT; void qdev_init_nofail(DeviceState *dev); void qdev_set_legacy_instance_id(DeviceState *dev, int alias_id, int required_for_version); -int qdev_unplug(DeviceState *dev); +void qdev_unplug(DeviceState *dev, Error **errp); void qdev_free(DeviceState *dev); int qdev_simple_unplug_cb(DeviceState *dev); void qdev_machine_creation_done(void); |