diff options
| author | Peter Maydell | 2015-02-25 14:14:37 +0100 |
|---|---|---|
| committer | Peter Maydell | 2015-02-25 14:14:37 +0100 |
| commit | 68b459eaa660be17d3547aa581502fe2c572c84f (patch) | |
| tree | e5b3edf44f205dea663ab6d082bfee78fc322d14 /include/hw/sparc/sun4m.h | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20150218-1' into s... (diff) | |
| parent | hmp: Name HMP info handler functions hmp_info_SUBCOMMAND() (diff) | |
| download | qemu-68b459eaa660be17d3547aa581502fe2c572c84f.tar.gz qemu-68b459eaa660be17d3547aa581502fe2c572c84f.tar.xz qemu-68b459eaa660be17d3547aa581502fe2c572c84f.zip | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2015-02-18' into staging
hmp: Normalize HMP command handler names
# gpg: Signature made Wed Feb 18 10:59:44 2015 GMT using RSA key ID EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>"
* remotes/armbru/tags/pull-monitor-2015-02-18:
hmp: Name HMP info handler functions hmp_info_SUBCOMMAND()
hmp: Name HMP command handler functions hmp_COMMAND()
hmp: Clean up declarations for long-gone info handlers
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw/sparc/sun4m.h')
| -rw-r--r-- | include/hw/sparc/sun4m.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/hw/sparc/sun4m.h b/include/hw/sparc/sun4m.h index a587700a8b..9c17425a43 100644 --- a/include/hw/sparc/sun4m.h +++ b/include/hw/sparc/sun4m.h @@ -29,8 +29,8 @@ void slavio_pic_info(Monitor *mon, DeviceState *dev); void slavio_irq_info(Monitor *mon, DeviceState *dev); /* sun4m.c */ -void sun4m_pic_info(Monitor *mon, const QDict *qdict); -void sun4m_irq_info(Monitor *mon, const QDict *qdict); +void sun4m_hmp_info_pic(Monitor *mon, const QDict *qdict); +void sun4m_hmp_info_irq(Monitor *mon, const QDict *qdict); /* sparc32_dma.c */ #include "hw/sparc/sparc32_dma.h" |