diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-17 13:09:57 -0600 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-17 13:09:57 -0600 |
commit | ddc01bf16e9f04b3e72c1b946b0b8efeb7a545d2 (patch) | |
tree | d5e8577e101bdd8263f44fcf941ea0989c36c2e9 /hw/sun4m.h | |
parent | e387f99ebc5753ebb5b7602d86e44d064873f83c (diff) | |
parent | 84c44613f9ad8d13e0d2dbee767051527072dc12 (diff) |
Merge remote-tracking branch 'luiz/queue/qmp' into staging
# By Wenchao Xia
# Via Luiz Capitulino
* luiz/queue/qmp:
HMP: add sub command table to info
HMP: move define of mon_cmds
HMP: add infrastructure for sub command
HMP: delete info handler
HMP: add QDict to info callback handler
Diffstat (limited to 'hw/sun4m.h')
-rw-r--r-- | hw/sun4m.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/sun4m.h b/hw/sun4m.h index 47eb945f07..0361eeed41 100644 --- a/hw/sun4m.h +++ b/hw/sun4m.h @@ -27,8 +27,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); -void sun4m_irq_info(Monitor *mon); +void sun4m_pic_info(Monitor *mon, const QDict *qdict); +void sun4m_irq_info(Monitor *mon, const QDict *qdict); /* sparc32_dma.c */ #include "sparc32_dma.h" |