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/i8259.c | |
| 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/i8259.c')
| -rw-r--r-- | hw/i8259.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/i8259.c b/hw/i8259.c index 264879e097..54fe14447b 100644 --- a/hw/i8259.c +++ b/hw/i8259.c @@ -407,7 +407,7 @@ static void pic_init(PICCommonState *s) qdev_init_gpio_in(&s->dev.qdev, pic_set_irq, 8); } -void pic_info(Monitor *mon) +void pic_info(Monitor *mon, const QDict *qdict) { int i; PICCommonState *s; @@ -425,7 +425,7 @@ void pic_info(Monitor *mon) } } -void irq_info(Monitor *mon) +void irq_info(Monitor *mon, const QDict *qdict) { #ifndef DEBUG_IRQ_COUNT monitor_printf(mon, "irq statistic code not compiled.\n"); |