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/pcmcia.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/pcmcia.h')
| -rw-r--r-- | hw/pcmcia.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/pcmcia.h b/hw/pcmcia.h index aac1d77cc7..f91669305e 100644 --- a/hw/pcmcia.h +++ b/hw/pcmcia.h @@ -14,7 +14,7 @@ typedef struct { void pcmcia_socket_register(PCMCIASocket *socket); void pcmcia_socket_unregister(PCMCIASocket *socket); -void pcmcia_info(Monitor *mon); +void pcmcia_info(Monitor *mon, const QDict *qdict); struct PCMCIACardState { void *state; |