[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 26/26] hmp: add parameters device and -v for info blo
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 26/26] hmp: add parameters device and -v for info block |
Date: |
Fri, 7 Jun 2013 13:58:45 +0200 |
From: Wenchao Xia <address@hidden>
With these parameters, user can choose the information to be showed,
to avoid message flood in the monitor.
Signed-off-by: Wenchao Xia <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
hmp.c | 25 ++++++++++++++++---------
monitor.c | 7 ++++---
2 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/hmp.c b/hmp.c
index 4fc3bfe..494a9aa 100644
--- a/hmp.c
+++ b/hmp.c
@@ -280,10 +280,15 @@ void hmp_info_block(Monitor *mon, const QDict *qdict)
{
BlockInfoList *block_list, *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);
for (info = block_list; info; info = info->next) {
+ if (device && strcmp(device, info->value->device)) {
+ continue;
+ }
monitor_printf(mon, "%s: removable=%d",
info->value->device, info->value->removable);
@@ -322,15 +327,17 @@ void hmp_info_block(Monitor *mon, const QDict *qdict)
info->value->inserted->iops_rd,
info->value->inserted->iops_wr);
- monitor_printf(mon, " images:\n");
- image_info = info->value->inserted->image;
- while (1) {
- bdrv_image_info_dump((fprintf_function)monitor_printf, mon,
- image_info);
- if (image_info->has_backing_image) {
- image_info = image_info->backing_image;
- } else {
- break;
+ if (verbose) {
+ monitor_printf(mon, " images:\n");
+ image_info = info->value->inserted->image;
+ while (1) {
+ bdrv_image_info_dump((fprintf_function)monitor_printf,
+ mon, image_info);
+ if (image_info->has_backing_image) {
+ image_info = image_info->backing_image;
+ } else {
+ break;
+ }
}
}
} else {
diff --git a/monitor.c b/monitor.c
index 9d279b8..017411f 100644
--- a/monitor.c
+++ b/monitor.c
@@ -2472,9 +2472,10 @@ static mon_cmd_t info_cmds[] = {
},
{
.name = "block",
- .args_type = "",
- .params = "",
- .help = "show the block devices",
+ .args_type = "verbose:-v,device:B?",
+ .params = "[-v] [device]",
+ .help = "show info of one block device or all block devices "
+ "(and details of images with -v option)",
.mhandler.cmd = hmp_info_block,
},
{
--
1.8.1.4
- Re: [Qemu-devel] [PULL 21/26] ide-test: Add FLUSH CACHE test case, (continued)
[Qemu-devel] [PULL 20/26] ide: Set BSY bit during FLUSH, Stefan Hajnoczi, 2013/06/07
[Qemu-devel] [PULL 22/26] block: add snapshot info query function bdrv_query_snapshot_info_list(), Stefan Hajnoczi, 2013/06/07
[Qemu-devel] [PULL 23/26] block: add image info query function bdrv_query_image_info(), Stefan Hajnoczi, 2013/06/07
[Qemu-devel] [PULL 24/26] qmp: add ImageInfo in BlockDeviceInfo used by query-block, Stefan Hajnoczi, 2013/06/07
[Qemu-devel] [PULL 25/26] hmp: show ImageInfo in 'info block', Stefan Hajnoczi, 2013/06/07
[Qemu-devel] [PULL 26/26] hmp: add parameters device and -v for info block,
Stefan Hajnoczi <=
Re: [Qemu-devel] [PULL 00/26] Block patches, Anthony Liguori, 2013/06/17