From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48520) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VXAt9-0004u7-Kq for qemu-devel@nongnu.org; Fri, 18 Oct 2013 10:18:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VXAt3-0001tb-H5 for qemu-devel@nongnu.org; Fri, 18 Oct 2013 10:18:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:10762) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VXAt3-0001tX-9a for qemu-devel@nongnu.org; Fri, 18 Oct 2013 10:18:45 -0400 From: Stefan Hajnoczi Date: Fri, 18 Oct 2013 16:18:29 +0200 Message-Id: <1382105915-27735-2-git-send-email-stefanha@redhat.com> In-Reply-To: <1382105915-27735-1-git-send-email-stefanha@redhat.com> References: <1382105915-27735-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 1/7] hmp: drop bogus "[not inserted]" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Mike Qiu , Stefan Hajnoczi , Anthony Liguori From: Mike Qiu 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(-) diff --git a/hmp.c b/hmp.c index 5891507..32ee285 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) { -- 1.8.3.1