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/loader.h | |
| parent | e387f99ebc5753ebb5b7602d86e44d064873f83c (diff) | |
| parent | 84c44613f9ad8d13e0d2dbee767051527072dc12 (diff) | |
| download | qemu-ddc01bf16e9f04b3e72c1b946b0b8efeb7a545d2.tar.gz | |
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/loader.h')
| -rw-r--r-- | hw/loader.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/loader.h b/hw/loader.h index 26480ad8dd..5e61c95b84 100644 --- a/hw/loader.h +++ b/hw/loader.h @@ -1,5 +1,6 @@ #ifndef LOADER_H #define LOADER_H +#include "qapi/qmp/qdict.h" /* loader.c */ int get_image_size(const char *filename); @@ -30,7 +31,7 @@ int rom_load_all(void); void rom_set_fw(void *f); int rom_copy(uint8_t *dest, hwaddr addr, size_t size); void *rom_ptr(hwaddr addr); -void do_info_roms(Monitor *mon); +void do_info_roms(Monitor *mon, const QDict *qdict); #define rom_add_file_fixed(_f, _a, _i) \ rom_add_file(_f, NULL, _a, _i) |