david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

block/hmp: Allow node-name in 'info block'

Browse Source 
The optional parameter specifying a block device allows now to use a
node-name instead of a drive name (and therefore to inspect any node in
the graph). The new -n options allows listing all named nodes instead of
BlockBackends.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Kevin Wolf 2014-09-15 12:19:14 +02:00
parent 8d6adccda2
commit e6bb31ec6f
2 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
hmp.c
View File

@ -403,10 +403,18 @@ static void print_block_info(Monitor *mon, BlockInfo *info,
void hmp_info_block(Monitor *mon, const QDict *qdict) void hmp_info_block(Monitor *mon, const QDict *qdict)
{ {
BlockInfoList *block_list, *info; BlockInfoList *block_list, *info;
BlockDeviceInfoList *blockdev_list, *blockdev;
const char *device = qdict_get_try_str(qdict, "device"); const char *device = qdict_get_try_str(qdict, "device");
bool verbose = qdict_get_try_bool(qdict, "verbose", 0); bool verbose = qdict_get_try_bool(qdict, "verbose", 0);
bool nodes = qdict_get_try_bool(qdict, "nodes", 0);
bool printed = false;
block_list = qmp_query_block(false); /* Print BlockBackend information */
if (!nodes) {
block_list = qmp_query_block(false);
} else {
block_list = NULL;
}
for (info = block_list; info; info = info->next) { for (info = block_list; info; info = info->next) {
if (device && strcmp(device, info->value->device)) { if (device && strcmp(device, info->value->device)) {
@ -420,9 +428,30 @@ void hmp_info_block(Monitor *mon, const QDict *qdict)
print_block_info(mon, info->value, info->value->has_inserted print_block_info(mon, info->value, info->value->has_inserted
? info->value->inserted : NULL, ? info->value->inserted : NULL,
verbose); verbose);
printed = true;
} }
qapi_free_BlockInfoList(block_list); qapi_free_BlockInfoList(block_list);
if ((!device && !nodes) || printed) {
return;
}
/* Print node information */
blockdev_list = qmp_query_named_block_nodes(NULL);
for (blockdev = blockdev_list; blockdev; blockdev = blockdev->next) {
assert(blockdev->value->has_node_name);
if (device && strcmp(device, blockdev->value->node_name)) {
continue;
}
if (blockdev != blockdev_list) {
monitor_printf(mon, "\n");
}
print_block_info(mon, NULL, blockdev->value, verbose);
}
qapi_free_BlockDeviceInfoList(blockdev_list);
} }
void hmp_info_blockstats(Monitor *mon, const QDict *qdict) void hmp_info_blockstats(Monitor *mon, const QDict *qdict)

6
monitor.c
View File

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