diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-10-23 17:05:15 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-10-23 17:05:15 +0100 |
| commit | 1430500bb8ba0bf15bad235439d62276c1b6b22f (patch) | |
| tree | 12e69462ce386b5b2076adcf15a9229516502b92 /include | |
| parent | e40830afa1cff3ffdc37bdfdd40d80860074636c (diff) | |
| parent | e799157c766d96506214059d8b75712a3e615431 (diff) | |
Merge remote-tracking branch 'remotes/qmp-unstable/tags/for-upstream' into staging
QMP patches
# gpg: Signature made Thu 23 Oct 2014 16:05:52 BST using RSA key ID E24ED5A7
# gpg: Good signature from "Luiz Capitulino <lcapitulino@gmail.com>"
* remotes/qmp-unstable/tags/for-upstream:
monitor: delete device_del_bus_completion
monitor: add del completion for peripheral device
qdev: add qdev_build_hotpluggable_device_list helper
MAINTAINERS: add entry for qobject files
dump: Turn some functions to void to make code cleaner
dump: Propagate errors into qmp_dump_guest_memory()
virtio-balloon: Tweak recent fix for integer overflow
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/qdev-core.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index 1fca75c591..22820fef5a 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -360,6 +360,8 @@ extern int qdev_hotplug; char *qdev_get_dev_path(DeviceState *dev); +int qdev_build_hotpluggable_device_list(Object *obj, void *opaque); + void qbus_set_hotplug_handler(BusState *bus, DeviceState *handler, Error **errp); |