From patchwork Fri Sep 1 16:51:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 9934893 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 230FD60216 for ; Fri, 1 Sep 2017 16:58:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 131F7269E2 for ; Fri, 1 Sep 2017 16:58:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 07D6326E3A; Fri, 1 Sep 2017 16:58:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id 38000269E2 for ; Fri, 1 Sep 2017 16:58:28 +0000 (UTC) Received: from localhost ([::1]:50084 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dnpH1-0008M4-AQ for patchwork-qemu-devel@patchwork.kernel.org; Fri, 01 Sep 2017 12:58:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50978) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dnpDh-0005oS-6z for qemu-devel@nongnu.org; Fri, 01 Sep 2017 12:55:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dnpDe-00064s-4e for qemu-devel@nongnu.org; Fri, 01 Sep 2017 12:55:01 -0400 Received: from mail-sn1nam02on0070.outbound.protection.outlook.com ([104.47.36.70]:33429 helo=NAM02-SN1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dnpDd-00063S-TT for qemu-devel@nongnu.org; Fri, 01 Sep 2017 12:54:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector1-xilinx-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=MngO1XZlN6cpe5g4/9Hq1wvXSVXXx2BTnG5xmOqQppo=; b=lU3PgJ7IGCd91h0Z9SlO7IOgpTr8XBXaKLl7qGFT6ILKquiQsfzvhUHkRYt4Uq+p/nwnI8J7y9q9pW4CuyT43aYw1PW2fokg+9H5qxA+bmmtPyQmyQPRUIhVEphhKJbTlx18hBF6m2yoJznEtHH08eQy1mFdoYScwwt3nUUQzIk= Received: from MWHPR0201CA0077.namprd02.prod.outlook.com (10.167.161.18) by CY1PR02MB1135.namprd02.prod.outlook.com (10.163.15.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.13.10; Fri, 1 Sep 2017 16:54:55 +0000 Received: from BL2NAM02FT056.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::206) by MWHPR0201CA0077.outlook.office365.com (2603:10b6:301:75::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.13.10 via Frontend Transport; Fri, 1 Sep 2017 16:54:54 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.100) smtp.mailfrom=xilinx.com; redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=bestguesspass action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.100 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.100; helo=xsj-pvapsmtpgw02; Received: from xsj-pvapsmtpgw02 (149.199.60.100) by BL2NAM02FT056.mail.protection.outlook.com (10.152.77.221) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1385.11 via Frontend Transport; Fri, 1 Sep 2017 16:54:53 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:56996 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1dnpDZ-0000PN-48; Fri, 01 Sep 2017 09:54:53 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1dnpDZ-0003eO-16; Fri, 01 Sep 2017 09:54:53 -0700 Received: from xsj-pvapsmtp01 (smtp.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id v81GsmkQ028953; Fri, 1 Sep 2017 09:54:48 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1dnpDU-0003dG-7N; Fri, 01 Sep 2017 09:54:48 -0700 From: Alistair Francis To: Date: Fri, 1 Sep 2017 09:51:09 -0700 Message-ID: <00d2599b6df0e4a0b57b8836c6ec1c39f97d71be.1504228916.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-23296.003 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.100; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(39860400002)(2980300002)(438002)(199003)(189002)(626005)(305945005)(4326008)(76176999)(50986999)(8936002)(77096006)(106466001)(2351001)(63266004)(189998001)(118296001)(39060400002)(33646002)(5003940100001)(50226002)(478600001)(2950100002)(6916009)(7416002)(5660300001)(2906002)(6666003)(110136004)(356003)(36386004)(36756003)(47776003)(50466002)(48376002)(8676002)(54906002)(81156014)(81166006)(9786002)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR02MB1135; H:xsj-pvapsmtpgw02; FPR:; SPF:Pass; PTR:xapps1.xilinx.com,unknown-60-100.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02FT056; 1:r7+vQFFRIS6fiRojZSvhcn/cr+F77MwaFoFwiezxiQ5iJ2MEAIY9xLEmAnVsx6V8Z4EBLjCEPizMVklzNoqbgmsL4HwoUKtB7GPz1r6MXi+WbYWmbtB1OUkRY5aTOKty MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 20a39f3e-5436-4695-b620-08d4f15a2b54 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(300000502095)(300135100095)(22001)(2017030254152)(8251501002)(300000503095)(300135400095)(2017052603199)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:CY1PR02MB1135; X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1135; 3:3xGDgbbzWzBWGXbgvQkT7zReAW2AVnZvAynHL5Ts1qBeKvvAEfCQI0kWa2UMi/xSWiNvBsByMzow3ld86BAhHllniIQ/UlE5F4aJx2YK2BJnW6hYdEQM7XwM3P1OiKTT2tOWEnYjqJNo1R2va0eyPqE9k8/QO7Iqkp0JvywigrLGc4nXFNJSJ7J0AB1azgtGjl5uQCTIEJjFeL2UVoDTcnirtQPVD+9Y0hGqNXgpTB4sdRyibJliBC9AkRRAmJa7yyHzWeJ5meqwivI2DZ+syM3R9oCkbzoxSwHFcOSnec/WgQ5pia3R759aSKVeEEeCZqpqnSW/xGF+bXeb5cp3ux4EN7E1kjORAzIez+aJ0pw=; 25:s6XeYELP86GGq7Gc+f8zIZj1SpWVDibp4SN+ERZQFH9+yBP7tx0IiNJiftKgGrSRpPOUZ3k5zxiDrnm6AyArlIbp9y4Gw9OrFwG/ArAxYYj6U4DDeOlUuUhgv3cZ6DJ+xq77nHR49o6Wu6thktF7ZYbR0GJd051jC6vxk9QxOQyndtA3p+jCIv48sa33S4qSmq8qI+5b5iRFuDWZuQ9vUuKF6NePurlWHIUEuY53iJFd/1DlqBJqjaFVgpO19muDwRxlT4J3WBR7Z8kmcbzzm0Rzus1kj1bd7BugxFL17AgLa1T2JPwmbt1FgERfGEA2ncuBcopuR3FCKjo1BrIItg== X-MS-TrafficTypeDiagnostic: CY1PR02MB1135: X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1135; 31:LOTlmbSAJIeGEUIrAEi3xCxAUbMYhaNIVVppIHS8iEorGCvxPaWRx6EhmT2nZP/V+x0VFhPBLUg5DF19DHV+9mYgHszDNAp8Pn80eODxUksIk3tejPGY6OtMQxoeA89dJuvq1A7wdUQ+g728UZ3aJLfQVr1knVqH/jSWgEmwh6DD7hyJbjyKnS5EmHUrFF+aKbMdqQzORGA7bh7ko1oVN8ysN8oDZMeaMEhR6Kr6grQ=; 20:e9HfvgobAYM17AAHASdjxeF11euH6zC3QaDk0c8ArurZ2/oqHlnIav/NQSP5R9TuNQJRzGoyPVpWdse4Vrh7dKmrTVuHfTECrssOs+fVh7Gi1XZE++cTKjI3Icv/kSsbSQQecMSR6h03ZJH4yuncOJJgBqCswgvYpqhU3H3xtet9xtTE2nmk4/KybfB6GidR7jruHdRCWB/0c0vK0aO0rImXR6ir0DT9YgDdYNJtqSkLklWQR/AzcofNvQupBts7hrfzvIWfdaV7rgace5xB8iUS1GTArLthrXSh2c7YyEYz49XD7Tnf6dX/eHx4MB7FPgqolKyxr1pLhlaFkfE9Xxsot4Mq1GvV5htO88TsMMkfjO3+hHIjs9xABUnyaY9WS9xRQUBA4dfbOU4r0DzPAhJQPbKnEp4xl593YZsNPdUtr1HZc5n5+E7M3ESz+vhCtWtZkploVPGdUy4D9LJXWbfqjM0mOBIXPb/mRBv5v2+zEwLlSz2qBWbCxEJpgRpW X-Exchange-Antispam-Report-Test: UriScan:(190383065149520)(192813158149592)(104084551191319); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(5005006)(8121501046)(13016025)(13018025)(3002001)(10201501046)(93006095)(93004095)(100000703101)(100105400095)(6055026)(6041248)(20161123555025)(20161123562025)(20161123558100)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY1PR02MB1135; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY1PR02MB1135; X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1135; 4:y5a80WhHcMAgK4bhRBULYKveuBspNSKZ/xIerAS0SHMj2PSZ+P7NKOOQ+jpgWCyyXKT6HGcNJoWG2npxK1xEkArgj36Ql5SDC0Hg6sqmz6knUQm4U0hx1AcGdzTs+EkOFyrWH9XeaPv00xPzfo+/RCXD+38hO7eanKAo1T+Y09S6hLWZNKbOuZt2cqFJOl5RwwJRThI0ubX8H7lo1NGji4YhAWRCpyzWAIoEmMphTxsAg+dc6g0wO3FjUjjR6Xstvajw/tDCCJqyYOR0TD9QJ4yES3jqgLOh6pZEkZ0q2ozVZvI4JWWEHzZJz5TpAKVdfOrvPGkmX/V0+lG/WatDAQ6+CF3J6WZWCLaOH8s/MkGr5ipriruFgxi9chckm+6n X-Forefront-PRVS: 0417A3FFD2 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR02MB1135; 23:cJgUoh8hMWhWvi9qKP9gqFzvGDU2e+MjVP1xP+bRm?= =?us-ascii?Q?v12LiUlrLAD8d9NHYUnHoSDc8SzzG5F40MxUb6WuGtp6U0AzhpB91rHoqgY4?= =?us-ascii?Q?pY0lmWQW3u7muAm0l/lOOaOEEeivbVjIvXqpbvhzn7ubk53lnIhl9zfz36Aj?= =?us-ascii?Q?8gwUiNl58A2Mpo8dSHTKjMPUvfvOBKhQzjCbh0xbSbM5Q0cOfkW1CtBqp15Q?= =?us-ascii?Q?KqNY2CRfta/23L0z3QYMy7MB1UEcAaNyAM3y52YOjnZPoHyogI+z0M5nsP79?= =?us-ascii?Q?GZgJ3qX77RgzV35yvoeykKL4PHJizVbhb8oXrxRfqg7rrdOFRfut28lSqYo+?= =?us-ascii?Q?re2fml6W1LJsc84eLr2tEN/Uk6tgJDTsefRyQGm8DXcw+lsKVd1A2sPoHcLi?= =?us-ascii?Q?oAgsKaK50gvcepE6YGz0aGxRNb5HkyMwWYBMAKY8Xbrx7uM7K/IB8tPIkBfh?= =?us-ascii?Q?cBsTDiaaZICOIUaEtd+YJSPCTYxz+9A7zKTbVNRMVvTlwwbGcycUGBPNR1Hl?= =?us-ascii?Q?MOUmtB3V9agKCmTmda5SXrpQSF0yYyG+/wQ09djQNrIB6Ocfr5UnwjvEAlYp?= =?us-ascii?Q?EQcUo8OYASC457BfV7zQDHheenO76xmKk69zQnuE5CppRkkOcKXGX+lVSRra?= =?us-ascii?Q?DjhKk/HLd+hj9PDah161toLTki4OoTZ/7FY79sQQTeGkCCmCz9hj2QhNhNR3?= =?us-ascii?Q?fXtpcOaqH3jlF/8Y+yn216N3/pd1sPqR/EOA3w+c5IqAYpKtaai6HeMPhaqO?= =?us-ascii?Q?anunDWzO00y/5CTe3E+vR2S2J2nDFzdHkHTzC5k+dKu3p4QVemp42NKzTyQp?= =?us-ascii?Q?mmO44UH1Af7Avl174ivErO/OdJieNu58gAuw238HYRGNW0AaSIjSiCRiS1vs?= =?us-ascii?Q?pi0OsTBbmpOapb28V0swGLsrRhbmhjjaLmXqs49CH9Xj2LR5VcIJk53BvHO2?= =?us-ascii?Q?CbG5oSkYSAfsSQohXAUWTdUBJtru4z/pY7NXrnaaCB4IYF4CkKp8p8ZEcefn?= =?us-ascii?Q?RbcopzPvEQhcp7UMFEsri2z78NGV69/F725MWJ5A9pkPZwb3MHLTE8C8w9Sd?= =?us-ascii?Q?tDkkyc=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1135; 6:E1vrHGNoNKCYd6B25/7KujHWR+w4xWm48cwqiGhG6SGDJW3l5PVEHRi2vR5V+LFpmaTpO/9ZtnhMJK3w++M7waSeQoLM++AV56VMcOAU9S9koOVLM2LKRWs/oumFldmlftv8w8aipmh1Co+50ChYNRlhDEA6b3MK10JZTI3NlKLu9dr0Non7tPX6hB/dfiYcFJGjogjpare47bpzJgn2FVfV/5zSlDlwFxIfPjywNluByWcI2Jr956FJwoRA4wzfJnanac9CLaplxwJNtbNaeUg1bzlUj7Z+ddRLh5xBvO3y/E9P8YG6AZzpvSAs+uz9rdUG7//IFMnr+9BaJZIzkg==; 5:iH2nThPhxH/FHir+QwMgn2ytlFWLCvKnsV0QXRLLl6TbCZWvUU9Uq/niQIWr5954nJ0VXGfxgfLoaJtPtcTvbS5Nl8mrQ+NkeeKmyzHxiyYtLIUXxe59hJZk59nuPy4/F5s1flTehu5nWrPEOs5rEQ==; 24:qyjE70qIwlT8nP9U2Y6R+vitBb6+YbE4bvSMPCACTzXuSqyQCFexhkRzOjLas716NI3ZHpY4KW2bdBCiJXwk1sB2PQH6ZlEQyc6cZbTu8uo=; 7:U+dT4YBtr8zmng1YocOOtKdzY3B7vNwMxd2BiC7ebfm9MbiL+oXny1LuKC///MzDuUv7Xqbshcx4ZmoVKliHtDMkLCEdJjbuUw/l3J7Rq6q956/WqO2pEidnQikEoAtwemtzACQvZe6MTwxjyN3Sv8gpRRBM8xtTWKdxEbJlCLRkhKfbuTwyURO7BC0L1Scm4DRQtwB3wRQB/XRqk1cxq0/7CPLu5ve6enH7wt35Fck= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Sep 2017 16:54:53.9905 (UTC) X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.100]; Helo=[xsj-pvapsmtpgw02] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR02MB1135 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.36.70 Subject: [Qemu-devel] [PATCH v3 2/7] Convert remaining error_report() to warn_report() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Alexander Graf , Cornelia Huck , armbru@redhat.com, Max Reitz , Christian Borntraeger , Stefan Hajnoczi , pbonzini@redhat.com, alistair23@gmail.com, alistair.francis@xilinx.com, Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP In a previous patch (3dc6f8693694a649a9c83f1e2746565b47683923) we converted uses of error_report("warning:"... to use warn_report() instead. This was to help standardise on a single method of printing warnings to the user. There appears to have been some cases that slipped through in patch sets applied around the same time, this patch catches the few remaining cases. All of the warnings were changed using this command: find ./* -type f -exec sed -i \ 's|error_report(".*warning[,:] |warn_report("|Ig' {} + Indentation fixed up manually afterwards. Two messages were manually fixed up as well. Signed-off-by: Alistair Francis Cc: Kevin Wolf Cc: Max Reitz Cc: Christian Borntraeger Cc: Cornelia Huck Cc: Alexander Graf Cc: Richard Henderson Cc: Stefan Hajnoczi Acked-by: Cornelia Huck Reviewed-by: Markus Armbruster --- block/qcow2.c | 9 +++++---- target/s390x/kvm.c | 4 ++-- trace/control.c | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 40ba26c111..27ce159b10 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -302,10 +302,11 @@ static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset, } if (!(s->autoclear_features & QCOW2_AUTOCLEAR_BITMAPS)) { - error_report("WARNING: a program lacking bitmap support " - "modified this file, so all bitmaps are now " - "considered inconsistent. Some clusters may be " - "leaked, run 'qemu-img check -r' on the image " + warn_report("a program lacking bitmap support " + "modified this file, so all bitmaps are now " + "considered inconsistent"); + error_printf("Some clusters may be leaked, " + "run 'qemu-img check -r' on the image " "file to fix."); if (need_update_header != NULL) { /* Updating is needed to drop invalid bitmap extension. */ diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c index c4c5791d27..dca53f544b 100644 --- a/target/s390x/kvm.c +++ b/target/s390x/kvm.c @@ -222,8 +222,8 @@ static void kvm_s390_enable_cmma(void) }; if (mem_path) { - error_report("Warning: CMM will not be enabled because it is not " - "compatible to hugetlbfs."); + warn_report("CMM will not be enabled because it is not " + "compatible with hugetlbfs."); return; } rc = kvm_vm_ioctl(kvm_state, KVM_SET_DEVICE_ATTR, &attr); diff --git a/trace/control.c b/trace/control.c index 82d8989c4d..2769934bec 100644 --- a/trace/control.c +++ b/trace/control.c @@ -72,8 +72,8 @@ void trace_event_register_group(TraceEvent **events) if (likely(next_vcpu_id < CPU_TRACE_DSTATE_MAX_EVENTS)) { events[i]->vcpu_id = next_vcpu_id++; } else { - error_report("WARNING: too many vcpu trace events; dropping '%s'", - events[i]->name); + warn_report("too many vcpu trace events; dropping '%s'", + events[i]->name); } } event_groups = g_renew(TraceEventGroup, event_groups, nevent_groups + 1);