From patchwork Thu Oct 3 01:08:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Meneghel Rodrigues X-Patchwork-Id: 280198 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 84D552C00B8 for ; Thu, 3 Oct 2013 11:09:12 +1000 (EST) Received: from localhost ([::1]:39262 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VRXPh-0000wa-1n for incoming@patchwork.ozlabs.org; Wed, 02 Oct 2013 21:09:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60530) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VRXPP-0000wR-Go for qemu-devel@nongnu.org; Wed, 02 Oct 2013 21:08:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VRXPJ-0005q5-Is for qemu-devel@nongnu.org; Wed, 02 Oct 2013 21:08:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:4066) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VRXPJ-0005pj-BM for qemu-devel@nongnu.org; Wed, 02 Oct 2013 21:08:45 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r9318hK6006540 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 2 Oct 2013 21:08:43 -0400 Received: from thinkpad-t420s.redhat.com (vpn1-5-145.ams2.redhat.com [10.36.5.145]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r9318ed2021128; Wed, 2 Oct 2013 21:08:41 -0400 From: Lucas Meneghel Rodrigues To: qemu-devel@nongnu.org Date: Wed, 2 Oct 2013 22:08:34 -0300 Message-Id: <1380762514-15096-1-git-send-email-lmr@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Lucas Meneghel Rodrigues , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH] hmp: Print \n after [not inserted] X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org I've noticed this when virt-test QEMU monitor protocol code was getting all confused with output like: 'Removable device: not locked, tray closed\n [not inserted](qemu) ' Since it was breaking some assumptions on that code. I've fixed the prompt matching code to be more lenient, but here the human monitor is supposed to print the newline anyway. CC: Stefan Hajnoczi Signed-off-by: Lucas Meneghel Rodrigues --- hmp.c | 2 +- roms/seabios | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hmp.c b/hmp.c index 5891507..2d2e5f8 100644 --- a/hmp.c +++ b/hmp.c @@ -367,7 +367,7 @@ void hmp_info_block(Monitor *mon, const QDict *qdict) info->value->inserted->iops_wr_max, info->value->inserted->iops_size); } else { - monitor_printf(mon, " [not inserted]"); + monitor_printf(mon, " [not inserted]\n"); } if (verbose) { diff --git a/roms/seabios b/roms/seabios index ece025f..7093aa5 160000 --- a/roms/seabios +++ b/roms/seabios @@ -1 +1 @@ -Subproject commit ece025f5980bae88fa677bc9c0d24d2e580e205d +Subproject commit 7093aa58046f8685025b0198708e7768733a017d