From 8d6adccda25d75dc152b68d15ac75e1670e59b23 Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Mon, 15 Sep 2014 12:12:52 +0200 Subject: block/hmp: Allow info = NULL in print_block_info() 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 --- hmp.c | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) (limited to 'hmp.c') diff --git a/hmp.c b/hmp.c index 2e2b91b..05ccf5f 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 + : ""); + } + 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"); + } } -- cgit v1.1