diff options
| author | Peter Maydell | 2015-03-17 16:23:23 +0100 |
|---|---|---|
| committer | Peter Maydell | 2015-03-17 16:23:23 +0100 |
| commit | 1a87e52770ca64f5a09e9c46d29ea3b5a5db5ffd (patch) | |
| tree | 905e1bf4bbf8f48e435097807e8c49d67f7262da /include/monitor/qdev.h | |
| parent | Merge remote-tracking branch 'remotes/armbru/tags/pull-cov-model-2015-03-17' ... (diff) | |
| parent | qdev: Move owner-less IRQs to /machine/unattached (diff) | |
| download | qemu-1a87e52770ca64f5a09e9c46d29ea3b5a5db5ffd.tar.gz qemu-1a87e52770ca64f5a09e9c46d29ea3b5a5db5ffd.tar.xz qemu-1a87e52770ca64f5a09e9c46d29ea3b5a5db5ffd.zip | |
Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-peter' into staging
QOM infrastructure fixes and device conversions
* Conversion of cadence_uart to QOM realize
* qom-tree QMP script
* qom-list and qom-set HMP commands to match their QMP counterparts
* Basic qom-tree HMP command
* Cleanups for /machine QOM composition tree
# gpg: Signature made Tue Mar 17 15:02:57 2015 GMT using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <afaerber@suse.de>"
# gpg: aka "Andreas Färber <afaerber@suse.com>"
* remotes/afaerber/tags/qom-devices-for-peter:
qdev: Move owner-less IRQs to /machine/unattached
memory: Move owner-less MemoryRegions to /machine/unattached
qom: Implement info qom-tree HMP command
qom: Implement qom-set HMP command
qom: Implement qom-list HMP command
scripts: Add qom-tree script
cadence_uart: Convert to QOM realize()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/monitor/qdev.h')
| -rw-r--r-- | include/monitor/qdev.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/monitor/qdev.h b/include/monitor/qdev.h index 5eb4a1171e..719075283c 100644 --- a/include/monitor/qdev.h +++ b/include/monitor/qdev.h @@ -8,6 +8,7 @@ void hmp_info_qtree(Monitor *mon, const QDict *qdict); void hmp_info_qdm(Monitor *mon, const QDict *qdict); +void hmp_info_qom_tree(Monitor *mon, const QDict *dict); int do_device_add(Monitor *mon, const QDict *qdict, QObject **ret_data); int qdev_device_help(QemuOpts *opts); DeviceState *qdev_device_add(QemuOpts *opts); |