From patchwork Wed Nov 8 22:56:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 836044 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="Id/eTYhQ"; 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 3yXMRG2TbKz9rvt for ; Thu, 9 Nov 2017 10:08:26 +1100 (AEDT) Received: from localhost ([::1]:34339 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZSK-0004lj-A7 for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:08:24 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34063) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZLL-0007km-CA for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZLI-00035n-6c for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:11 -0500 Received: from mail-dm3nam03on0069.outbound.protection.outlook.com ([104.47.41.69]:15784 helo=NAM03-DM3-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 1eCZLH-00035X-UT for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:01:08 -0500 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=3yhRBSYmsH7kaOjQ0f/YoETi0LQlmHAnnPGrad+In0g=; b=Id/eTYhQAj+e+ekPKpYUqQNvmU/8Dbzw0iu9/QLbi852AUGbV/RB08k9ySBEWhIRPqNKA7uJmP74xe21qoWDZewWTZI2vWmb2aXHavwPgbKitcwTkttuuIxhJm3UjTpdcdSxP9thjWMuV3bXnrDMCCTOEhJvntoOoVpQ2IrBl5c= Received: from CY4PR02CA0019.namprd02.prod.outlook.com (10.169.188.29) by BN6PR02MB3380.namprd02.prod.outlook.com (10.161.153.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.197.13; Wed, 8 Nov 2017 23:01:05 +0000 Received: from BL2NAM02FT017.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::204) by CY4PR02CA0019.outlook.office365.com (2603:10b6:903:18::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.197.13 via Frontend Transport; Wed, 8 Nov 2017 23:01:05 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.100) smtp.mailfrom=xilinx.com; gmail.com; dkim=none (message not signed) header.d=none;gmail.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 BL2NAM02FT017.mail.protection.outlook.com (10.152.77.174) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 23:01:04 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:33351 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1eCZLE-0003xO-1z; Wed, 08 Nov 2017 15:01:04 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZLD-0002XC-OW; Wed, 08 Nov 2017 15:01:03 -0800 Received: from xsj-pvapsmtp01 (mailhub.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id vA8N0tBg008730; Wed, 8 Nov 2017 15:00:55 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZL4-0002NC-TU; Wed, 08 Nov 2017 15:00:54 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:56:55 -0800 Message-ID: <52a2e1755b0e8d163c2d59a77adfad48976fbbdc.1510181732.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-23450.000 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)(346002)(376002)(2980300002)(438002)(199003)(189002)(76176999)(9786002)(118296001)(4326008)(5003940100001)(106002)(5660300001)(63266004)(16586007)(6916009)(2950100002)(54906003)(575784001)(47776003)(39060400002)(189998001)(8936002)(2351001)(81156014)(81166006)(8676002)(50466002)(106466001)(77096006)(50226002)(2906002)(36756003)(48376002)(316002)(478600001)(50986999)(36386004)(356003)(33646002)(305945005)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR02MB3380; 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; BL2NAM02FT017; 1:V/5jSkkw+BsfzxPv/cqlfCWcGBJ+eryCPvMYVmtzp1sob531EG3c/qydgQmqmmNpyqKwPjrHqgnl5qhBgGKUhfNH1sFgpSG2mPQP5XX2T8ankfmd9flGzOGYx1DT2nJf MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 049a17b7-6a56-4bda-c6e3-08d526fc9708 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:BN6PR02MB3380; X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3380; 3:Q5Ceoh/MiEvKiThmFI93PUGLNYuVlNcc9yTMIwz2GyCCQIn0V6l1HQGemyIlZTiNqy3/IH8+NhGbvv8xNpOQw56auKiLeHzSsS6m/GsiqDOwFxEVRgUeMRFBXViZa8nEgE8u8GiSo7VIm2u9xCm1eGni4Ws67nou0h88UlOLQV1r6W69c9l+2RQDZArwmxK6obIw1l5lGxEjpiDkQpw6EQWk5HCdOLQCm1U2uAPLRm9aNLoBOkUXDMU+Gz+qvsY9kF+x5GTSxYb0tIQ7v1BoEguSC0YXjrOqHhRqhAhdEkjwNk6x+RMCQnfn3giNWdvOXhNPrTFLdlhaOrkeX7yfubQtvV89JRC1JwEl4rHu6QQ=; 25:niN1ldJykZh7j7VTGPi0SAR4PLPv4K39INsjgoh63dfOpRR6zWCXBPNKg9wy0YIfixC3McQTsavSSCzLGQsQxmkqj2cXxCh1BxqsUo5XWKXpJc9gvV1SNeEu74nClsb8miO8ON0xF8DLX4Ntqh1y1KeibqN23QXqyiOrURBaGQ7Ch0W7yBP2AKsCxEh8fbX6kFQ8VusdQy7Bc2kECLy0M4F4isDiqkQpP+bkQH65bXdv5QimmT7JaQR6XCxdt/Zg2V4YNpPE9Yb8dU5yvlaX7hoR+qV72aMw7r6W5HCm0KFVkBHqLQFhSJks8Fxsv0uscu2h1vnB95yrI/uZCyWcXQ== X-MS-TrafficTypeDiagnostic: BN6PR02MB3380: X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3380; 31:XEaxFsNziqpaJv6eKmlR7VpTT4H7Vw/pxpvAZsH9iLKKjWn56VPO5oN7X+cXSBvKdNP8rkj4Iv4N5P+8AsiSZ7eo8Xi4wkGDT77I6HhA/v9xp9yaSVnHNxm/l690wzrGbTKO07iVjaJjmXubrZ73+2BT26zGrejLjMIS/i2F6Nxj3N7GApX3alYbMOQ1JVqCKir9I4rph4sju6oKyfPi+pl65Wt6WEforMWhRKHnDxg=; 20:OalUphnp8C6equWc1R72WBZeSXthEZ4Sh9SrqUjXVxsgLT3LW9DzeqpV3BsmhY6opUiUpLdtwKEcMmx2zVIepdDXRKrkl+tfzZpccf7FkMKLvhj7lCXxSSotQ0NYnsrYBT6ipHsGNF47FcAKm2HYIjhvhqDPqrmCpL9mnI98sKrvijSgKoe5aQ5o29Uv03PP6Bz9P6unC/WWwkEiIFYJ46qm+np8SkltRux/ItpoDBrVQaao2CTnQj2gKP5EMmklBmcH3hhuk+23cICXGnRS2ODPI0lkoqhsowxASes5xZVS+oF62MXZbXsiUVRcZgIC0MpMNEy4XRorfkb6HwYmOKvF48A980MRXN7TpqUCrUtDdirA510D5JSCp1CsvYINmi9UT6j4wckRDKacF+wT2p7FAmapX2cgTO5lSN/oa4brraYCSjdYd7aUPY21Z3E8Cj0TeUz8nNazlKUkOo0kxfIx5onEFSlhWCX3dnE0B5thtA/a2k0GmCV2RhFybVej X-Exchange-Antispam-Report-Test: UriScan:(788757137089)(192813158149592); 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)(3002001)(10201501046)(93006095)(93004095)(100000703101)(100105400095)(3231021)(6055026)(6041248)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123564025)(20161123555025)(20161123562025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BN6PR02MB3380; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BN6PR02MB3380; X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3380; 4:ZjgNhWOwjgDP1ONla1myFur1awB/oO422/Z+cWg1LV+HjZwl3VRTXRtk8TpTJDe/oSUp7661bSWtT0p1wLEGkwmAsqY7zja56ArbCegipUwYOP7okzO52JH9R4X6SIAZzEvTMUxQkyiiiygpSUZRCnRPzzj5hOi/7CgmPyQSZW8dv1XOMA6ACu7NleTdJ5EtTETxHRDbgL7GsWX5Mky/3OFwzbu5yU9rIEaojGT7J+IVbRAF3N09MJjLaA5xc1PxqIHmfClNTdz85QDO4gg5R/VC+yNL5r/TpgetsFwIJXxnhMSqi7oYHq1snIRJ4CuDemLzdyKskjg1mdP3tHFNJA== X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR02MB3380; 23:lmTW1hnjrOKHRIClUMfb4IEHG14MO/tdDbv52QvgF?= 4TZymaSbkGL3tz846lxAuLUBizAo5dWWSrkbdjbQKp0CdvjMcVpdA/cKJ6O3IapBuuKvspJ3HnrbZSzRzP9uBriAy9dH8HGljln6zbpsTGOaAU/IdxsMWoXh/OKuiHz5t3tc6D3BcvZy+CXfFuy6ju15URd1cUKqZLV5qf65/xlZIo7JSdTgRKa8rQkOvQ1hFhTdkXhghCOjZltrvJhaJtwtQUAv13o00QxI/XcGsJ7m69iRmTmPQUsYQI7JqfDej9YRNiZhXllLPENlTkOFGqjoKc7mJbVu9G1pjnB3XI4jyTwhu2ndqmLIl1mvAk9gW9CYaiwntJ38WigFoobvawNK9MP2SrtyNP9gAHDMdW67qCJVygSsD1+VtzJUacat7hryMrTHGt7wXlSS5Xwo6GnU+aNJXUXM00a2qoifdtk5WoKdQVTJw25c71/9YKINIwJzdanx8jd7ZYm8gCGssdLUx1tKY8Xo0suPki3VmDaN3bL8Ckf7dfBJEsxLgZAAGQ2kBCcbP/huHd1jIfsGf9UcuBo7//0CayibxbKjJypyEuVChOB4IeiqlwxozNedU+CMNxb9TOFm7hcxHYDhUDbaF6wJK31ATXDWL1NglAshIJWO26WP3UTKb8FTdZsf90eLHXqtJ7xu3Shi+6IobZLEYpkbbQcjkjX5vInbNJTp2Q+lJ3PaMtOT/7PLqAxjEmRJpO2er+V0iRitVvhr7TMPKmF0m7dXYAjTbNR/fe1RdyG5YPuaAuI1mcPKgp7XBafoUHqH2+G+ok6qRz02DvDtbis2nseSh0WJEhkN1ibcokSb9KkNY2kNie5gGdjn2gtobO7FahF1HCk3eF5zlTT+QONvBjPjfmw6l0hFKoD/S0TIThSFd/wATt4vNyP11itlCVxMZqpVKCvh3/9vF38Z4eUQ2D/V5EE7QYYMsGdII1Tzy0OHnN89DU6pYfoI5zJahX7zTuXGcwoY/9bFApuCgcHXuOtReP6H4C+yWemhRacp+4mY7CZzo0/Vt3hwYE= X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3380; 6:n5E1Klbcx0KzNxelFQ5/P7efr88YoFyoBuFM1tZiv+G4F4d55IPwqkT5LPNbnrei8CzjxZCk/YACJJr9Cy7FZTY/MCyse45lv8NPV46fQI1wHRBKaN7U1xI3ue2qLOuvfPWeMbkDDEyTL415i1c5xDWLwNNJhIMlYAQnkC3KyTk7QxgKUJTXmv+0zneTW2AeacG5mW3+XK4CQUZmTVQg0RYnpT0PSSg76DAEo1o9/3pFL9OVIfWE+2VhFsjUFIwa94La1rWI6CAmeLQygIQRzaLBNXtmpIl/J8rSFad3TULpyYa4cus/S2lF2/hK0kl+QWOyyqwr7f1VBEEszo//Vu/cXpvnlAifWP9iooFHQQE=; 5:0T1Ha1cRfLqocj/suH4mGrYhBsK3uUxleCCbsIzQu7BlcTd/X44O+gSfFd4zxQAkkAMRh38QteMZtO76TBfNeVNFpSPowloPkHo8miKiyEq0O8ZSDbetjIRMbX5TGDn5VIC6AdfaoN/jM+4ZvFRSRs8P08U+ta/8j0sz00TJd+E=; 24:Ah9zEvuYUUzwZvqaaISouanukpA5qNZoHNmMiGzmGFsSM1VGEdqwbLqq9saZYePFv+Gc17WS2SaD5PVtFDZ359TpWWKWSI/i8qczpv8kehQ=; 7:0kJ3o8lp7Z0gsfiD6F6nnyhinEIJSAmkXiBcgENju+x/Dtx95J3X43mWT16akhxjsD9inbMv4CBa+VbXkPufshsHMxGCOoUVkJiYJ3Di3ZObdSXak48Z5Q5dMrCSrU4jeO1ph1p3D7ES5CdEMnc69gevfZ2o0QK8CqY71zmlzYd5bE38WuGpkCHcdJpbMTcIVJbJnXbsKUKShWurxZuAjT3xCPh5ZI5aVL/GTf1Qo4e3PCd7EGiaXdy61UfvtIKe SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:01:04.7685 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 049a17b7-6a56-4bda-c6e3-08d526fc9708 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: BN6PR02MB3380 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.41.69 Subject: [Qemu-devel] [PATCH v4 10/45] hw/cris: Replace fprintf(stderr, "*\n" with error_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: alistair23@gmail.com, "Edgar E. Iglesias" , armbru@redhat.com, alistair.francis@xilinx.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Replace a large number of the fprintf(stderr, "*\n" calls with error_report(). The functions were renamed with these commands and then compiler issues where manually fixed. find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + find ./* -type f -exec sed -i \ 'N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \ {} + Some lines where then manually tweaked to pass checkpatch. Signed-off-by: Alistair Francis Cc: "Edgar E. Iglesias" Reviewed-by: Philippe Mathieu-Daud --- V2: - Split hw patch into individual directories hw/cris/axis_dev88.c | 3 ++- hw/cris/boot.c | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/hw/cris/axis_dev88.c b/hw/cris/axis_dev88.c index 9ccc4350a5..df124d5128 100644 --- a/hw/cris/axis_dev88.c +++ b/hw/cris/axis_dev88.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "qemu-common.h" #include "cpu.h" @@ -345,7 +346,7 @@ void axisdev88_init(MachineState *machine) li.cmdline = kernel_cmdline; cris_load_image(cpu, &li); } else if (!qtest_enabled()) { - fprintf(stderr, "Kernel image must be specified\n"); + error_report("Kernel image must be specified"); exit(1); } } diff --git a/hw/cris/boot.c b/hw/cris/boot.c index f896ed7f86..fda0a039b8 100644 --- a/hw/cris/boot.c +++ b/hw/cris/boot.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu-common.h" #include "cpu.h" #include "hw/hw.h" @@ -86,14 +87,13 @@ void cris_load_image(CRISCPU *cpu, struct cris_load_info *li) } if (image_size < 0) { - fprintf(stderr, "qemu: could not load kernel '%s'\n", - li->image_filename); + error_report("could not load kernel '%s'", li->image_filename); exit(1); } if (li->cmdline && (kcmdline_len = strlen(li->cmdline))) { if (kcmdline_len > 256) { - fprintf(stderr, "Too long CRIS kernel cmdline (max 256)\n"); + error_report("Too long CRIS kernel cmdline (max 256)"); exit(1); } pstrcpy_targphys("cmdline", 0x40000000, 256, li->cmdline);