From patchwork Mon Feb 1 22:15:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Baumann X-Patchwork-Id: 8184081 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 47F09BEEE5 for ; Mon, 1 Feb 2016 22:16:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7E17B20381 for ; Mon, 1 Feb 2016 22:16:15 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A05B720375 for ; Mon, 1 Feb 2016 22:16:14 +0000 (UTC) Received: from localhost ([::1]:54256 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQMlY-0000Mt-N0 for patchwork-qemu-devel@patchwork.kernel.org; Mon, 01 Feb 2016 17:16:12 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60612) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQMlJ-0000Lp-4B for qemu-devel@nongnu.org; Mon, 01 Feb 2016 17:15:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aQMlG-0002pl-Ty for qemu-devel@nongnu.org; Mon, 01 Feb 2016 17:15:57 -0500 Received: from mail-bn1bn0102.outbound.protection.outlook.com ([157.56.110.102]:62736 helo=na01-bn1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQMlG-0002ob-Nf for qemu-devel@nongnu.org; Mon, 01 Feb 2016 17:15:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:To:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=sMlPAwDo1ouirZT7wN+/fmIb2LGcyBIZ2kSj/7r/GgM=; b=nTWvELiQV0S+4UsIYXSNyYmfhvlGt+rD7yYixTsxLvA9Q/Aaw9nEDMAT3/yDrnQ5V5/ajDOKlLQiZFJmrXSjzlUvOS8p1Wqc/o3Xa+AFQckC2ZEX/tU9lPEf/0uwq8c8MZfaZG26J7yADWMcFyBtMEXjFhHvYKqgn4031idftz4= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none; nongnu.org; dmarc=none action=none header.from=microsoft.com; Received: from baumann-desk.redmond.corp.microsoft.com (2001:4898:80e8:4::724) by CY1PR0301MB2041.namprd03.prod.outlook.com (10.164.2.23) with Microsoft SMTP Server (TLS) id 15.1.396.15; Mon, 1 Feb 2016 22:15:53 +0000 From: Andrew Baumann To: Date: Mon, 1 Feb 2016 14:15:36 -0800 Message-ID: <1454364936-18940-4-git-send-email-Andrew.Baumann@microsoft.com> X-Mailer: git-send-email 2.5.1 In-Reply-To: <1454364936-18940-1-git-send-email-Andrew.Baumann@microsoft.com> References: <1454364936-18940-1-git-send-email-Andrew.Baumann@microsoft.com> MIME-Version: 1.0 X-Originating-IP: [2001:4898:80e8:4::724] X-ClientProxiedBy: CO1PR06CA059.namprd06.prod.outlook.com (10.242.160.49) To CY1PR0301MB2041.namprd03.prod.outlook.com (25.164.2.23) X-MS-Office365-Filtering-Correlation-Id: c64eb7d9-6e4e-49a1-4f4c-08d32b553ff0 X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB2041; 2:tpSydB/hXV0COMW3uHvkFKGWbadPy9JEPQURZ2YxfUYOy0UlbB0EjEYY1yCDS//4VBnR8/fTbQNtllUmpquOCWMu8bpdHfqPKht+zNBL1MsNpvYYJjZ4iPa6waUt3rk3mmAs8IgcngMaoOSEI0bEn1+sqZaOgq+ZjrXMl9/Alfm2ClQ1XDLLIsDkZ8Z/lq1u; 3:+17fdeDZRQ10Ft+djA6E2O+j3SVj9CeLsobJKIrj7mZFdCHULwjq+lEUo6KS9XPRU72jNMyH4KcKKyGHrVU8qkRzoPthWwDtCQfxesAfcAP9+bcS7a6np27PjN4roWDk; 25:2S+YRCvQjFa2+A+jHZUHyciQfouqx2UrRat0ijXl5cmvgfLCYaKMf8XlaMc5MVAky0P40UicLueGwjSkLc1W7ihM7PGBvhP0ar/HnY21tz79+Rf1WZpCezFXu6EZd+sg9qdKm/ILkdv6xPzZpe/jE5UCwjl69I4re52vij9u9MkLpSB19ij2pcEEa1Ebe8qjjBi6RssLeZmMKjlygPpS/DwwZh99vo2bSgXp0D6NjS+VQdB13fTJRL0m8nVOgykYWQSEjnr6s1nbYfPmy3QiILNUed5As9J2u2PSYsKx3Cg= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0301MB2041; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB2041; 20:6qraVlLjfdpV8jiCTC+puRu8Wy2RI1Pz4GmlSzBRlrwdORUJ71mrml8aiPAqsNu+A9TzMDb0p7GAG5BFeKQOum2Y4YomWyJYeiD7qClfZBXjcUIllTovXftQu0quwSKzRxi7E25SGow8zkIw9lFPovK0Wb2Q5mZVRQXy13NZzEofIZYPyb6McjmdJXiT3ltLFjI5YNeTcvvEuZYJ0Z/B4gYFM+nMi/yt81su7S04qy7yQidS3FgTvu/Y7cj5s/eoZXTPIYTsJP1sosefuVwNtpUgV3XW5K1f4Bm8Qg42nABmwZFlnOfv7Ar6B6MKR/+AtdvF6P0Ib2CJosNWLatjjyjVwwpj5Ce+jrTm/IkT2qvdVtsvCs9fS586FpoLgdv0xmIHMpf8cgL0+bghu/TwJIjnclcqhtUkUt1DGCBfOWqWBidedNNdSyUBKuZ0BxCF9K8geMRktwdTwSnmehvb6oWRLUtUxreae/IZ/LFrNvKyO5AyvKyAanuylb2Q1+28; 4:OnYfYSM5hK7htbMR8ewccKXevmB/chfCeLzci3Go4oVU0bMAN4T6sD61Ltu23bX40pPTNa+K0DkoyMXHmlZVtjljTWni+QyW2oEKa7uOJqx8i9gFCjrJeDwf2loY1398YGnTFwmFoyNwrRRNXXiW9ScUB9MyAOmMLIbLzGeHZeZpsWa4nYaxOBBW/C56hTa0B+5of7JpV0PTYrTxOr+ioGcNcek9l4tUbw+ECSk+5aUymn+6TcrLsJwpGa272o1xjdiZZvlWyaPGqKdUP8ptIh7QScC50tQ238zThpzU+i8PimYqLpWxZG0elhWrh7jtVQ5+8MdhM9DS12m3+wL+4y+F9KT+sdX67qOGc8uRTOucsBAO9JHlV17CE7ryNCUg X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046); SRVR:CY1PR0301MB2041; BCL:0; PCL:0; RULEID:; SRVR:CY1PR0301MB2041; X-Forefront-PRVS: 0839D067E7 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(36756003)(122386002)(77096005)(6116002)(50466002)(40100003)(10290500002)(4001430100002)(50986999)(92566002)(5004730100002)(5008740100001)(107886002)(87976001)(2950100001)(5005710100001)(110136002)(5001960100002)(1096002)(76176999)(586003)(2906002)(3470700001)(4326007)(189998001)(2351001)(42186005)(47776003)(86362001)(19580395003)(19580405001)(50226001)(48376002)(5003940100001)(86612001)(229853001)(10090500001)(7059030)(3826002); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR0301MB2041; H:baumann-desk.redmond.corp.microsoft.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0301MB2041; 23:02CxMt5zfFnbaASwFfsweUTi3C86yjK66cnSfyU?= =?us-ascii?Q?u1riQ9HPAmZc+KIjFHchl2HhMWeIbo8Dr1joFEdjZB66ZpEoGd3O/ou0Vnha?= =?us-ascii?Q?sJSrGAKpUDxiB4k+EOJ+BYrWtZug06OrIcNF46UkNrfLVRNhMEWDUD0iUPfj?= =?us-ascii?Q?Kya/N5zHxilq49nfocbb9z8aSj1E4euNjRv4CdNECmsvBt2kdLTKw8iqUR80?= =?us-ascii?Q?sXK/Lkq8Tha6Eff0uUImTU8Gcxpmf+7DLQ93+mklZ88lDSLnDuY1l+EuQMfM?= =?us-ascii?Q?90CmAgkD7Swrjjpg9n7Ex27ta7NXEAJBV2jhtf6KZ9ehLdHyYJCITKHWBbof?= =?us-ascii?Q?ZBVKqaPdVGlpPwbcoeHPkHfnoStTWs7OqdaBiEhHKUO9MUmDCAbV6BbPlDD7?= =?us-ascii?Q?rRTv8KPFPDaPpwoK6z45fSAiivLNrY/cikiXkiK6rmPD9kpOcDXTjzTyEKKe?= =?us-ascii?Q?ulGn+FZYnOQG7reIFiP4gbLe8QAEkbqtVaU5A8ibZn6nvO5hZoi4KYngLv74?= =?us-ascii?Q?ZVOR0FnBkht68AHfbaZ6GHCJZvXCai5BbmIlVj/98CmwNzm7t+VEk4FQ5VTK?= =?us-ascii?Q?v34AisO5hujiqUHPgjomFyYzl0of4lcpOYH3DF00JHotDLxgYTpq8MVc9051?= =?us-ascii?Q?ChX6o4YFRd3QkZV6AFjPAh/P+5P1GhlHFcaziNCwsMxPDhLh1gjm+/cDX6hi?= =?us-ascii?Q?wKKFu7MRXJNMRyy0n/2exmRyq7hf4pMXh8XpbwCQhKHaymXiqd9bAyiHy7DR?= =?us-ascii?Q?eNNaphxrnUdvvjqa5ZS5apkr9xvdVBD1/RC3bgXtSNrJCW5cI6o6pBZA2Mrq?= =?us-ascii?Q?eHbVAGUItIbGVxOSU0u8POoP8Jx++c3LmpX1HCHnrob13MQ5aL/VOdllBmTI?= =?us-ascii?Q?MADikChoHh33POQofBqcq44FC441eq2XXA7oUUMkqgxkNvPz9KzR9nNsTQSt?= =?us-ascii?Q?i0swNn1XVZ0ZDktCZH96DK//+UougpjnS08FApzzH8473k1Q5yhI1go+YARa?= =?us-ascii?Q?WoPmkoLTeYb0nDEJnHGd1rYWFQ+ydZqGojJ0ntKgiqkJtL6wFpc3Yxu1iuW/?= =?us-ascii?Q?uiX2L5JAXhOXaMgnDZPjseOjQyYXvnWlpg3A45r3FW22c1U2YJA=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB2041; 5:dmepzRtpAEtfZ3eb+Z8GGNm+s55K7ew/nVQHRZI8esiTA9G2XcfcOaoOGKPey59Pk1q5il9cF/ctHa5lnn4V5BlGE2wLwUpiuogV10FpUItvg6bijdcAk8THLxuoJJ+Te+BSHr45//sa99RAXa15sQ==; 24:ZQsnD2ZcdscLPIHORa4nEE1Hake+dMq5czwM99pK0hKsuiTpZiilQ/eqixXgFWcYWRaYuY30F5JU6KW+FYo/HC3NLuVIINgxesoePyyshVI= X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Feb 2016 22:15:53.1317 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0301MB2041 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 X-Received-From: 157.56.110.102 Cc: Peter Maydell , Juan Quintela , Igor Mitsyanko , Andrew Baumann , Sai Pavan Boddu , Peter Crosthwaite , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH v3 3/3] hw/sd: use guest error logging rather than fprintf to stderr 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Some of these errors may be harmless (e.g. probing unimplemented commands, or issuing CMD12 in the wrong state), and may also be quite frequent. Spamming the standard error output isn't desirable in such cases. Reviewed-by: Peter Crosthwaite Signed-off-by: Andrew Baumann --- It might also be desirable to have a squelch mechanism for these messages, but at least for my use-case, this is sufficient, since they only occur during boot time. hw/sd/sd.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c index 473d4a0..4794538 100755 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -1294,16 +1294,17 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, default: bad_cmd: - fprintf(stderr, "SD: Unknown CMD%i\n", req.cmd); + qemu_log_mask(LOG_GUEST_ERROR, "SD: Unknown CMD%i\n", req.cmd); return sd_illegal; unimplemented_cmd: /* Commands that are recognised but not yet implemented in SPI mode. */ - fprintf(stderr, "SD: CMD%i not implemented in SPI mode\n", req.cmd); + qemu_log_mask(LOG_UNIMP, "SD: CMD%i not implemented in SPI mode\n", + req.cmd); return sd_illegal; } - fprintf(stderr, "SD: CMD%i in a wrong state\n", req.cmd); + qemu_log_mask(LOG_GUEST_ERROR, "SD: CMD%i in a wrong state\n", req.cmd); return sd_illegal; } @@ -1435,7 +1436,7 @@ static sd_rsp_type_t sd_app_command(SDState *sd, return sd_normal_command(sd, req); } - fprintf(stderr, "SD: ACMD%i in a wrong state\n", req.cmd); + qemu_log_mask(LOG_GUEST_ERROR, "SD: ACMD%i in a wrong state\n", req.cmd); return sd_illegal; } @@ -1478,7 +1479,7 @@ int sd_do_command(SDState *sd, SDRequest *req, if (!cmd_valid_while_locked(sd, req)) { sd->card_status |= ILLEGAL_COMMAND; sd->expecting_acmd = false; - fprintf(stderr, "SD: Card is locked\n"); + qemu_log_mask(LOG_GUEST_ERROR, "SD: Card is locked\n"); rtype = sd_illegal; goto send_response; } @@ -1636,7 +1637,8 @@ void sd_write_data(SDState *sd, uint8_t value) return; if (sd->state != sd_receivingdata_state) { - fprintf(stderr, "sd_write_data: not in Receiving-Data state\n"); + qemu_log_mask(LOG_GUEST_ERROR, + "sd_write_data: not in Receiving-Data state\n"); return; } @@ -1755,7 +1757,7 @@ void sd_write_data(SDState *sd, uint8_t value) break; default: - fprintf(stderr, "sd_write_data: unknown command\n"); + qemu_log_mask(LOG_GUEST_ERROR, "sd_write_data: unknown command\n"); break; } } @@ -1770,7 +1772,8 @@ uint8_t sd_read_data(SDState *sd) return 0x00; if (sd->state != sd_sendingdata_state) { - fprintf(stderr, "sd_read_data: not in Sending-Data state\n"); + qemu_log_mask(LOG_GUEST_ERROR, + "sd_read_data: not in Sending-Data state\n"); return 0x00; } @@ -1881,7 +1884,7 @@ uint8_t sd_read_data(SDState *sd) break; default: - fprintf(stderr, "sd_read_data: unknown command\n"); + qemu_log_mask(LOG_GUEST_ERROR, "sd_read_data: unknown command\n"); return 0x00; }