From 684b25447c10b9171e5aa9305075b830885fe6e3 Mon Sep 17 00:00:00 2001 From: Mike Qiu Date: Wed, 16 Oct 2013 23:16:01 -0400 Subject: hmp: drop bogus "[not inserted]" Commit 3e9fab690d59ac15956c3733fe0794ce1ae4c4af ("block: Add support for throttling burst max in QMP and the command line.") introduced bogus "[not inserted]" output, possibly due to a merge failure. Remove this artifact. Output of 'info block' scsi0-hd0: /images/f18-ppc64.qcow2 (qcow2) [not inserted] scsi0-cd2: [not inserted] Removable device: not locked, tray closed floppy0: [not inserted] Removable device: not locked, tray closed sd0: [not inserted] Removable device: not locked, tray closed There will be no additional lines between scsi0-hd0 and scsi0-cd2. At the same time, scsi0-hd0 already inserted, but still has '[not inserted]' flag. This line should be removed. This patch is to solve this. Signed-off-by: Mike Qiu Signed-off-by: Stefan Hajnoczi --- hmp.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'hmp.c') diff --git a/hmp.c b/hmp.c index 589150773e..32ee285a1e 100644 --- a/hmp.c +++ b/hmp.c @@ -366,8 +366,6 @@ void hmp_info_block(Monitor *mon, const QDict *qdict) info->value->inserted->iops_rd_max, info->value->inserted->iops_wr_max, info->value->inserted->iops_size); - } else { - monitor_printf(mon, " [not inserted]"); } if (verbose) { -- cgit v1.2.1