From patchwork Mon Sep 11 19:52:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 812570 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=xilinx.onmicrosoft.com header.i=@xilinx.onmicrosoft.com header.b="D0UXMzhj"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xrdxV3sYwz9s8J for ; Tue, 12 Sep 2017 05:57:18 +1000 (AEST) Received: from localhost ([::1]:60216 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1drUpY-00063F-It for incoming@patchwork.ozlabs.org; Mon, 11 Sep 2017 15:57:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39872) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1drUot-000618-KM for qemu-devel@nongnu.org; Mon, 11 Sep 2017 15:56:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1drUop-00022k-Rw for qemu-devel@nongnu.org; Mon, 11 Sep 2017 15:56:35 -0400 Received: from mail-bn3nam01on0075.outbound.protection.outlook.com ([104.47.33.75]:52954 helo=NAM01-BN3-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 1drUop-00021S-M2 for qemu-devel@nongnu.org; Mon, 11 Sep 2017 15:56:31 -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=uzcPqv2SvApsrpcB270gkNJyRbh1lcFte53xWJQWSp4=; b=D0UXMzhjIExfXBxsGwySMTc3BCwMy/6BH4FIpWZToygnSWSs97AiMfj11TynpkpQNpbDU2v5qiquCtZxpF+RSjfRNeNh5IOYNV90+FzlON+Een/eyNXa4cJNZYb3zkxw9Y6KZNxTjWrkjRU8vqs8q86qOKwWnMUNKHUD5DBji7Y= Received: from MWHPR0201CA0025.namprd02.prod.outlook.com (2603:10b6:301:74::38) by BY1PR02MB1129.namprd02.prod.outlook.com (2a01:111:e400:52a7::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.35.12; Mon, 11 Sep 2017 19:56:28 +0000 Received: from SN1NAM02FT057.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::200) by MWHPR0201CA0025.outlook.office365.com (2603:10b6:301:74::38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.9 via Frontend Transport; Mon, 11 Sep 2017 19:56:28 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.83) 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.83 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.83; helo=xsj-pvapsmtpgw01; Received: from xsj-pvapsmtpgw01 (149.199.60.83) by SN1NAM02FT057.mail.protection.outlook.com (10.152.73.105) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.13.11 via Frontend Transport; Mon, 11 Sep 2017 19:56:27 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66] helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1drUok-0000If-QH; Mon, 11 Sep 2017 12:56:26 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1drUok-0008Vd-My; Mon, 11 Sep 2017 12:56:26 -0700 Received: from xsj-pvapsmtp01 (maildrop.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id v8BJuLuW029740; Mon, 11 Sep 2017 12:56:21 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1drUof-0008Ur-JT; Mon, 11 Sep 2017 12:56:21 -0700 From: Alistair Francis To: Date: Mon, 11 Sep 2017 12:52:46 -0700 Message-ID: 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-23322.005 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.83; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(39860400002)(2980300002)(438002)(199003)(189002)(2906002)(33646002)(63266004)(2351001)(77096006)(106466001)(8676002)(118296001)(189998001)(50986999)(50466002)(5003940100001)(76176999)(48376002)(50226002)(81166006)(81156014)(47776003)(8936002)(36756003)(36386004)(9786002)(478600001)(6916009)(2950100002)(54906002)(356003)(7416002)(6666003)(5660300001)(305945005)(110136004)(4326008)(39060400002)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY1PR02MB1129; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SN1NAM02FT057; 1:mk9OaqAaB0nwFKxMHwbPiAaoeFTA3srhdMBK+0p+kzPS6YklxoKcnhGg6Zjihb4Z5Z9zNX/bwU6jU4vTWo5+vluUM2Masm7QbIT/IfhR4s/53/ZqcYQDVOmpndRNHqyF MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 36643dc2-b171-4a63-ec6e-08d4f94f3083 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(8251501002)(300000503095)(300135400095)(2017052603199)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:BY1PR02MB1129; X-Microsoft-Exchange-Diagnostics: 1; BY1PR02MB1129; 3:UpCkVf7g8pF3kTl4Pc8To9w8ci8wagh8vdFUj0vboT/kz3aEIyH0FRn+wQt5cZC34tNg6p8Wbf4BuZWiZsNSR9M19a2YCaLtpt9H3QVzAY3ETIvSKn+ncuJpdodbx9px5dUM6OSEaSOPKJb6Ak35dz/1+q+vzv3ODMg09zG3jZriZyZjrNCVc+MYCOQDgxxBHAQ6dFGWSJs9lM+VLARy/e6XaoUKTpNXHg4zBl9ZDuWVmRrm/pIPyaNPRI8OhoYDkJj8s97HJLVLMVzgrdQ2oNFR3f0w7lhX/m2KxFhZUzUiQ23diEnt/leZTFQVu9eKUIY6caTFW2eAcyH0lk54QNoo4PNgylpWp0SeOAW/kO8=; 25:mU/uXmCQYaHMbwNO+OvWaYcekv9flgH8h2frfKZzyT7sMs+Uf7xf0g4OO3m/DtAvGe312c+noaqtg/f7aWvUui2o1Nea4t/Se9eoNIFW2sP9GOEikFXyellPkI7HpUaZe2l0aCjBiGAfFXgnQcfIpWBLKcNznUf9oDWS7vw9jtTETF1us3YJz1WP4uSawWhlcYYV2tIvj53eONg6CYMxPR5U4tBcZOZBitde6+H2X5jxXBkKZn+okLedfC3WZsuzpUgqBWZUeQfKLFzhe4B91QZS1/8YBQY5+PG3mlVGOLCd8Zo7N3eEWnq2obwUPY22r4kzU8kbr+TsCnHv/Uu0+Q== X-MS-TrafficTypeDiagnostic: BY1PR02MB1129: X-Microsoft-Exchange-Diagnostics: 1; BY1PR02MB1129; 31:x95UXgUtP9s45SN1PGZeaGuHo1uWQnIs2RCuF8f/07NRf2gv21wcVnsWG7T+5ZAQIGiaOO6FVieOrPzBc6g1pHDt4gJYzKfKzG4ue9i4H+62tDftyZ3b53jpkEnJggTmPMVmB9d8QsOcTY0Eer5aAH3sjSaemag8wcL4YvJYXYbDLLYgqUCgl4aCouf/cQw01xTfyBKXHTyS/j/j5zysWD2pppDNJtmRh9ZKmOeoNUQ=; 20:UODD1BMOXpv+4i7XH3JDbD1sqPtz+OVQExdYA0DLTt9lKTFWW7u/buOQhYtKgT9sCX2yJu9aqzuWCB4cpryDqzepwV/DdkCmEjh0qLEjTeApaL+784aeF1BKj1gGjW9knoSFQ71tYTz2jj+5fe30aw5L9RiBtmIS8F+62MgnkftE5pMMSjoDbN4mMCtvU9ZQsMudSXAQkuGTPff6sWbkZs9RQR41EkRNR6LDykyhb4w7dWc4w7k6PqxzSlnG72g4mMhTFVr251ZYUSy6/+YAvvdwX0yfXjXUoqEKnHwH24puTTk4+8SBLMLFO467FH/zQq/gQVRpgnbGwRTb16w9EyjEaMowL9sfhfLK8NYLwiVEpZSPWSaYXv23OavA3EkynOt6yua3H8T3VblqsiN/S5Aq/zLkhmUUH1agxqWd+8+XHi/RUXrof1qA8GO4sxW9HQFWSwWn+G+ytJCVex9lu3KLjIOSInzeVnIf4EZYjsxLRgEKQoQr/ZN2RSjxP4Pq 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)(2401047)(5005006)(8121501046)(93006095)(93004095)(100000703101)(100105400095)(3002001)(10201501046)(6055026)(6041248)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(20161123564025)(20161123562025)(20161123558100)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BY1PR02MB1129; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BY1PR02MB1129; X-Microsoft-Exchange-Diagnostics: 1; BY1PR02MB1129; 4:G3pOhgIgc0nWfcb0SeTMT/9UxLoUmkM9pMjyU6JGuVUUiresizabSPV6hgENQ+0wkVyPOw6hJWfBeugMfvmzHqCQBcairrwwvlJ/b1cQKtOvLoa1dE0sshBTwTv3F5e6Wsqc2o9Dr1x1CnArXQrQ/VVZ2Z4V0gOPs9An4p9oPzthAp82MeUnc9pMQ6VdQVd+nwBvss0q+o9DHTkDJlVwBdFi46x75iKXdfBgOlHzWaRzBuuX/cjqWqLhgvryUWg53mEBkmrkBkj0iaC/LkqLW0Ls3u+REmTED6xO7ZEfZ04NXSii96gFBr5NkAx5XJWW7hCN43xcmcKB8rnqGNAARIzFDUfNImy+fxweM7o6fDHa8DlEtth9KOl531fbwZAU X-Forefront-PRVS: 04270EF89C X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY1PR02MB1129; 23:qdwmySItjNUokKzX3+WVSZIq9fB7E89sOtRh9bBb6?= svtL/BdHP4UaaxoMvS3IwzUNhllDT+H5sOUCEwCpMXqPtCf222IQVNi9FrSumg826mzdJAEaX1VvT00pCFiBvl3g1yAUH0B59uXC+VJLeh4vnp53pLZeMtp7oC75jC/RR+aSmU3G0hyJoWsOLHCKMsDJVuHppIK91qVOC0IHUE7tJ6oMlS1ZmQ6lFVbN6mclVIRnaVUU2b2f7Fm1FNWjDMd4ZBY7YWwko6UgMhS/UQepqfzLWGFJPtYasoRulaDG0lWdmc5NbZ05C4KDo8rjXFEIIMbuDag5n+byXWZ9MtdVijulMKysnM9cOI3vwE5x5e28mNbVc2XlpjcWZYchrNn7voM/GuMZc0dVOV7JMJdpHaKPLe6xbLG/zgy8vldDUkw95Mg77Oc4ymgZOffx8eenRjFJI8REAMjAX76HnF/dg30o1nmjcJaAnjpHPMVG2xjhw7JeRUibpx2ZFo+J3ZuT2pKmILt2ZhL4ufK36jB2xfPSqh4IiLA3plyHR4YUMD/4IYadLKlynmD+pmUU5HT3NoPFgACS9w6paMabwe8ThYTd4qhuszntHQ3U0987vqZvfvYlc+3kNhPHeiEgoAfmjBuGSMFagicd9cgBMbJJowiiKr9gAnR/17q/YHPXJS39ZpP0OV0voV1Br24vMdrXt+KC1Z3lKfXjLNxtuRC1H2CuMdE+556g0EoWYD/xfYEPqweLIwb92a7cIa+ZF0P5r/sjRVjsiVpSyQ1pfyY1m8eVi7oU1Wd83D7MDVYIiAsFRlq12RMnFDZOT3SrcRxCfd9ZZthKxScB9gp8MCtwsGEwNKoFVOw3ZbC0RRNsCTMb7MjEPYIE4Nv9M7Ruv2/T8jEw6XsldCNFwOpCLWDvsfKy2a1dFF+NKkCu2zz3ARReJe+GvSaWEA8kc54P6AR6nZHFklHEdaPjl7r/sTSG98OT8DBlvqfdhE6g1nF4IYb8MSwvmuKBQlHl9mtrIda X-Microsoft-Exchange-Diagnostics: 1; BY1PR02MB1129; 6:Xo0nZ/UozRPbgOGwEUbcgNj071ytuT/KUd4Lg5OuKJ5sz6LUk5wT9PUlomV7GeNqmZf4r+x5JmbBURg5q7unNuc8nZdbK74rwTmEQnMxLS0SNtkzwK7dreVtJL+hpoey+sP2A3acMSHjOgSRQ4fIfwvn2WQ8URFdvVbC3E+NEu+GNgkMetNoC/5e/kaUlVjBMwRYeypSs20+tWd+HsD55wK40mR6ugxggAh3gxZuZ0sblIdb0Lxmm0fkt/NvyGUJQL8kgIL6l9dvV6zht2eOT8wMMg3xp5JR9CnLa/5I0IgObGnryTSaPaLnRFGOYC/yzaQ0clh9QLbf8/3lH3irLA==; 5:AxtyY8Z1g8V7ZtERvlXQ7XdSLOxDBx9yJwAEGc2Bn3/Higu5ClaNy+Xw7vo1F4SBTkKYDw8aKNZCkn5qPGQk8VhLDeBZT4rApdI5N+cirOgQM8L22CPIb2YUmfbr/fSZrbNi9OJwef3ofUbM+lcXAQ==; 24:a+x548I+z72HUYh5h2xBTen3bWapOTjNb6q9qENwfX2P8nyYzzIcmRyxlmbQif4u7ZPn2RqESI26fKk+AoihQmNQJa0ln0/H4o4dQ+C1Br0=; 7:1gm81X4FkAzwhZxeIS8N0RuRkG4O+NXHHdwOQP+LFP+G82uXUPruPpA2eioPZXDSv4enoCGioOl+VqZ6/EDcZGHShRA6hfERrbQcWAe26mEFmCDyT8NYDOKz+fvwMtkingeZflgBHKPHgOjkKF8HHXyKkV3Q/kk2esGEs/+yxOLktNdYfeCF3hnjSDBCA0uBheLZJ1IDOYQvvrHqcwxMjSYK60TSnzJ9tEKD37Vz0GU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2017 19:56:27.2923 (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.83]; Helo=[xsj-pvapsmtpgw01] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR02MB1129 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.33.75 Subject: [Qemu-devel] [PATCH v4 2/8] 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 bae5893327..d33fb3ecdd 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -301,10 +301,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 d07763ff2c..ad7ce9fc70 100644 --- a/target/s390x/kvm.c +++ b/target/s390x/kvm.c @@ -224,8 +224,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);