mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hmp: add parameters device and -v for info block

Browse Source 
With these parameters, user can choose the information to be showed,
to avoid message flood in the monitor.

Signed-off-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Wenchao Xia 2013-06-06 12:28:01 +08:00 committed by Stefan Hajnoczi
parent bd093a365e
commit e73fe2b46c
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hmp.c
View File

@ -280,10 +280,15 @@ void hmp_info_block(Monitor *mon, const QDict *qdict)
{ {
BlockInfoList *block_list, *info; BlockInfoList *block_list, *info;
ImageInfo *image_info; ImageInfo *image_info;
const char *device = qdict_get_try_str(qdict, "device");
bool verbose = qdict_get_try_bool(qdict, "verbose", 0);
block_list = qmp_query_block(NULL); block_list = qmp_query_block(NULL);
for (info = block_list; info; info = info->next) { for (info = block_list; info; info = info->next) {
if (device && strcmp(device, info->value->device)) {
continue;
}
monitor_printf(mon, "%s: removable=%d", monitor_printf(mon, "%s: removable=%d",
info->value->device, info->value->removable); info->value->device, info->value->removable);
@ -322,17 +327,19 @@ void hmp_info_block(Monitor *mon, const QDict *qdict)
info->value->inserted->iops_rd, info->value->inserted->iops_rd,
info->value->inserted->iops_wr); info->value->inserted->iops_wr);
if (verbose) {
monitor_printf(mon, " images:\n"); monitor_printf(mon, " images:\n");
image_info = info->value->inserted->image; image_info = info->value->inserted->image;
while (1) { while (1) {
bdrv_image_info_dump((fprintf_function)monitor_printf, mon, bdrv_image_info_dump((fprintf_function)monitor_printf,
image_info); mon, image_info);
if (image_info->has_backing_image) { if (image_info->has_backing_image) {
image_info = image_info->backing_image; image_info = image_info->backing_image;
} else { } else {
break; break;
} }
} }
}
} else { } else {
monitor_printf(mon, " [not inserted]"); monitor_printf(mon, " [not inserted]");
} }

7
monitor.c
View File

@ -2472,9 +2472,10 @@ static mon_cmd_t info_cmds[] = {
}, },
{ {
.name = "block", .name = "block",
.args_type = "", .args_type = "verbose:-v,device:B?",
.params = "", .params = "[-v] [device]",
.help = "show the block devices", .help = "show info of one block device or all block devices "
"(and details of images with -v option)",
.mhandler.cmd = hmp_info_block, .mhandler.cmd = hmp_info_block,
}, },
{ {