[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 3/5] block/hmp: Allow info = NULL in print_block_
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH v2 3/5] block/hmp: Allow info = NULL in print_block_info() |
Date: |
Wed, 12 Nov 2014 17:11:16 +0100 |
This allows printing infos of BlockDriverStates that aren't at the root
of the graph (and logically implementing a BlockBackend).
Signed-off-by: Kevin Wolf <address@hidden>
---
hmp.c | 34 +++++++++++++++++++++++++---------
1 file changed, 25 insertions(+), 9 deletions(-)
diff --git a/hmp.c b/hmp.c
index 0eba501..5f8c41d 100644
--- a/hmp.c
+++ b/hmp.c
@@ -295,7 +295,21 @@ static void print_block_info(Monitor *mon, BlockInfo *info,
{
ImageInfo *image_info;
- monitor_printf(mon, "%s", info->device);
+ assert(!info || !info->has_inserted || info->inserted == inserted);
+
+ if (info) {
+ monitor_printf(mon, "%s", info->device);
+ if (inserted && inserted->has_node_name) {
+ monitor_printf(mon, " (%s)", inserted->node_name);
+ }
+ } else {
+ assert(inserted);
+ monitor_printf(mon, "%s",
+ inserted->has_node_name
+ ? inserted->node_name
+ : "<anonymous>");
+ }
+
if (inserted) {
monitor_printf(mon, ": %s (%s%s%s)\n",
inserted->file,
@@ -306,15 +320,17 @@ static void print_block_info(Monitor *mon, BlockInfo
*info,
monitor_printf(mon, ": [not inserted]\n");
}
- if (info->has_io_status && info->io_status != BLOCK_DEVICE_IO_STATUS_OK) {
- monitor_printf(mon, " I/O status: %s\n",
- BlockDeviceIoStatus_lookup[info->io_status]);
- }
+ if (info) {
+ if (info->has_io_status && info->io_status !=
BLOCK_DEVICE_IO_STATUS_OK) {
+ monitor_printf(mon, " I/O status: %s\n",
+ BlockDeviceIoStatus_lookup[info->io_status]);
+ }
- if (info->removable) {
- monitor_printf(mon, " Removable device: %slocked, tray %s\n",
- info->locked ? "" : "not ",
- info->tray_open ? "open" : "closed");
+ if (info->removable) {
+ monitor_printf(mon, " Removable device: %slocked, tray %s\n",
+ info->locked ? "" : "not ",
+ info->tray_open ? "open" : "closed");
+ }
}
--
1.8.3.1
- [Qemu-devel] [PATCH v2 0/5] block: QMP cache info and HMP node support, Kevin Wolf, 2014/11/12
- [Qemu-devel] [PATCH v2 1/5] block/qapi: Add cache information to query-block, Kevin Wolf, 2014/11/12
- [Qemu-devel] [PATCH v2 2/5] block/hmp: Factor out print_block_info(), Kevin Wolf, 2014/11/12
- [Qemu-devel] [PATCH v2 3/5] block/hmp: Allow info = NULL in print_block_info(),
Kevin Wolf <=
- [Qemu-devel] [PATCH v2 4/5] block/hmp: Allow node-name in 'info block', Kevin Wolf, 2014/11/12
- [Qemu-devel] [PATCH v2 5/5] monitor: Fix HMP tab completion, Kevin Wolf, 2014/11/12
- Re: [Qemu-devel] [PATCH v2 0/5] block: QMP cache info and HMP node support, Kevin Wolf, 2014/11/21