From patchwork Fri Oct 18 01:11:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wayne Xia X-Patchwork-Id: 284476 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 ABF5C2C00CB for ; Fri, 18 Oct 2013 20:22:38 +1100 (EST) Received: from localhost ([::1]:56480 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VX68P-0003vy-Qh for incoming@patchwork.ozlabs.org; Fri, 18 Oct 2013 05:14:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57840) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VX660-0000R0-PD for qemu-devel@nongnu.org; Fri, 18 Oct 2013 05:11:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VX65r-0007DZ-Mi for qemu-devel@nongnu.org; Fri, 18 Oct 2013 05:11:48 -0400 Received: from e28smtp04.in.ibm.com ([122.248.162.4]:37078) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VX65r-0007DM-3P for qemu-devel@nongnu.org; Fri, 18 Oct 2013 05:11:39 -0400 Received: from /spool/local by e28smtp04.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 18 Oct 2013 14:41:37 +0530 Received: from d28dlp02.in.ibm.com (9.184.220.127) by e28smtp04.in.ibm.com (192.168.1.134) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 18 Oct 2013 14:41:36 +0530 Received: from d28relay03.in.ibm.com (d28relay03.in.ibm.com [9.184.220.60]) by d28dlp02.in.ibm.com (Postfix) with ESMTP id D9AC5394003F for ; Fri, 18 Oct 2013 14:41:15 +0530 (IST) Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay03.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r9I9EKHB44171452 for ; Fri, 18 Oct 2013 14:44:20 +0530 Received: from d28av02.in.ibm.com (localhost [127.0.0.1]) by d28av02.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id r9I9BZ44009214 for ; Fri, 18 Oct 2013 14:41:35 +0530 Received: from RH64wenchao ([9.181.129.59]) by d28av02.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id r9I9BOpG008595; Fri, 18 Oct 2013 14:41:34 +0530 From: Wenchao Xia To: qemu-devel@nongnu.org Date: Fri, 18 Oct 2013 09:11:14 +0800 Message-Id: <1382058681-14957-7-git-send-email-xiawenc@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1382058681-14957-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1382058681-14957-1-git-send-email-xiawenc@linux.vnet.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13101809-5564-0000-0000-00000A3A164B X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 122.248.162.4 Cc: kwolf@redhat.com, stefanha@gmail.com, lcapitulino@redhat.com, pbonzini@redhat.com, Wenchao Xia Subject: [Qemu-devel] [PATCH 06/13] error: remove error_printf_unless_qmp() 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 monitor_vprintf() is called in the code path, and it will not print when monitor is in qmp mode, so checking monitor mode in error_printf_unless_qmp() is useless, remove it to simplify the code. Signed-off-by: Wenchao Xia Reviewed-by: Paolo Bonzini --- hw/usb/bus.c | 2 +- hw/usb/hcd-ehci.c | 4 ++-- include/qemu/error-report.h | 1 - util/qemu-error.c | 11 ----------- 4 files changed, 3 insertions(+), 15 deletions(-) diff --git a/hw/usb/bus.c b/hw/usb/bus.c index 72d5b92..817a69a 100644 --- a/hw/usb/bus.c +++ b/hw/usb/bus.c @@ -328,7 +328,7 @@ int usb_register_companion(const char *masterbus, USBPort *ports[], qerror_report(QERR_INVALID_PARAMETER_VALUE, "masterbus", "an USB masterbus"); if (bus) { - error_printf_unless_qmp( + error_report( "USB bus '%s' does not allow companion controllers\n", masterbus); } diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c index 22bdbf4..bb7e003 100644 --- a/hw/usb/hcd-ehci.c +++ b/hw/usb/hcd-ehci.c @@ -848,7 +848,7 @@ static int ehci_register_companion(USBBus *bus, USBPort *ports[], if (firstport + portcount > NB_PORTS) { qerror_report(QERR_INVALID_PARAMETER_VALUE, "firstport", "firstport on masterbus"); - error_printf_unless_qmp( + error_report( "firstport value of %u makes companion take ports %u - %u, which " "is outside of the valid range of 0 - %u\n", firstport, firstport, firstport + portcount - 1, NB_PORTS - 1); @@ -859,7 +859,7 @@ static int ehci_register_companion(USBBus *bus, USBPort *ports[], if (s->companion_ports[firstport + i]) { qerror_report(QERR_INVALID_PARAMETER_VALUE, "masterbus", "an USB masterbus"); - error_printf_unless_qmp( + error_report( "port %u on masterbus %s already has a companion assigned\n", firstport + i, bus->qbus.name); return -1; diff --git a/include/qemu/error-report.h b/include/qemu/error-report.h index 3b098a9..5297e65 100644 --- a/include/qemu/error-report.h +++ b/include/qemu/error-report.h @@ -36,7 +36,6 @@ void loc_set_file(const char *fname, int lno); void error_vprintf(const char *fmt, va_list ap) GCC_FMT_ATTR(1, 0); void error_printf(const char *fmt, ...) GCC_FMT_ATTR(1, 2); -void error_printf_unless_qmp(const char *fmt, ...) GCC_FMT_ATTR(1, 2); void error_print_loc(void); void error_set_progname(const char *argv0); void error_report(const char *fmt, ...) GCC_FMT_ATTR(1, 2); diff --git a/util/qemu-error.c b/util/qemu-error.c index fec02c6..85e8a79 100644 --- a/util/qemu-error.c +++ b/util/qemu-error.c @@ -40,17 +40,6 @@ void error_printf(const char *fmt, ...) va_end(ap); } -void error_printf_unless_qmp(const char *fmt, ...) -{ - va_list ap; - - if (!monitor_cur_is_qmp()) { - va_start(ap, fmt); - error_vprintf(fmt, ap); - va_end(ap); - } -} - static Location std_loc = { .kind = LOC_NONE };