From patchwork Thu Oct 19 16:16:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 828200 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="vmvI35bn"; 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 3yHvT13XG2z9t6K for ; Fri, 20 Oct 2017 03:26:45 +1100 (AEDT) Received: from localhost ([::1]:50093 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5Ded-0000rJ-GF for incoming@patchwork.ozlabs.org; Thu, 19 Oct 2017 12:26:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55421) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5DYl-0004gC-Vh for qemu-devel@nongnu.org; Thu, 19 Oct 2017 12:20:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e5DYk-0001Nd-RA for qemu-devel@nongnu.org; Thu, 19 Oct 2017 12:20:39 -0400 Received: from mail-sn1nam01on0055.outbound.protection.outlook.com ([104.47.32.55]:28935 helo=NAM01-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 1e5DYf-0001GE-Qd; Thu, 19 Oct 2017 12:20:34 -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=Fm2gVa9rCj2sRRORDcrGJc2eNwvrJqXUR8YaPLZYRiQ=; b=vmvI35bnPD1S/eQvsTflmy1Uukg10DgrzAbyLjEwJChjue1f7SY/2K3jgHncWtYaCiQbh5BuIyfKuGOv42sSyOw6ef2kTo767P6v8ESvrtLVL99Wqr/lyUYg2Wxyk4CYxhJFee41Gy39HzA7oEI2m3g2Ntgb02LloZIogkx0w8A= Received: from SN4PR0201CA0009.namprd02.prod.outlook.com (2603:10b6:803:2b::19) by DM2PR02MB1338.namprd02.prod.outlook.com (2a01:111:e400:50c8::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Thu, 19 Oct 2017 16:20:31 +0000 Received: from BL2NAM02FT028.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::204) by SN4PR0201CA0009.outlook.office365.com (2603:10b6:803:2b::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.156.4 via Frontend Transport; Thu, 19 Oct 2017 16:20:31 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.83) smtp.mailfrom=xilinx.com; nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; 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 BL2NAM02FT028.mail.protection.outlook.com (10.152.77.165) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.77.10 via Frontend Transport; Thu, 19 Oct 2017 16:20:30 +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 1e5DYb-0008VR-Ue; Thu, 19 Oct 2017 09:20:29 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1e5DYb-0002xd-Ri; Thu, 19 Oct 2017 09:20:29 -0700 Received: from xsj-pvapsmtp01 (smtp2.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id v9JGKPDi017852; Thu, 19 Oct 2017 09:20:25 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1e5DYX-0002x6-Eb; Thu, 19 Oct 2017 09:20:25 -0700 From: Alistair Francis To: Date: Thu, 19 Oct 2017 09:16:32 -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-23404.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)(376002)(39860400002)(346002)(2980300002)(438002)(199003)(189002)(50226002)(50466002)(8676002)(356003)(9786002)(76176999)(106466001)(81156014)(81166006)(47776003)(39060400002)(33646002)(36756003)(50986999)(305945005)(48376002)(118296001)(4326008)(63266004)(2351001)(6916009)(106002)(2906002)(16586007)(36386004)(8936002)(316002)(5660300001)(54906003)(478600001)(2950100002)(5003940100001)(6666003)(189998001)(77096006)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR02MB1338; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02FT028; 1:Daar5AkzxwCfpWkNY3GYTjGewYIrIYJw9khVCqC0mk6BkGaceTN8u6H3I4f8uosWiFAdf4pwsllG+cd40eDq/VAxhWD5bcAhk8lQ6mvOyIh8yduPuE4hk4/TrNypH8KU MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 565ceae5-8f8b-4216-20b1-08d5170d5150 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(8251501002)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:DM2PR02MB1338; X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1338; 3:uZW7Wk9buOMP9ZRVxqtNeaThI6rw4rJGXQskmcFnUkvAE77nzXmHdhsvtJhLw6JwJRBuPRlqlUcNQDHUPPr8+vFkhVtRrYrsd0NxX/K1xqmMTQPl5Qbs50vsr2ueytMhRnmD6LDel3YrCCTaEw+MTjejSoCNPZ8Zij4G7b5/wcYJqJQQhkYxGU1gtQY7moJH/R4y+tgRyxEc14i8CVfHuZ7aou4fC9AnCOxC/utkaortQS/k56JVv9ioddpdAeCJW+5zfFE9HePeA6aMMQ3KUwaHSdq3MokmiLPkP4M6ehtsRAa9nPwvjbVZojJwTjjWRUMrgHc0fZWFJf3rSpY7WDe+xePFiB3ba1fYifL7m3U=; 25:7FFY5cgPwgxoTROrPuSVHX7mmQcnLEQNyVPPJR7Z9BAWE5t3PNbhabpJUZV+aKQ+vNFYGu697KJqdbgN/zD2mxtZpHD0VcmH/ZCxdb2245T0oz1drOwC/cm7HAjmwUXF3sbW8ZFAJhyFGTQRFcYAW3qOufbudRk0Yoft7z2jKrKLTAa3RcTK0hGM5Cc6CkYqmN2g0zm0A2mnEGKaD450bJeC6VL8DX0RjC5DISGGFwFtX1LGRh3cD87Zz3iywCKqY9jEeKchG3SiLoctPQ5QvlQnubibxF1L6yajaV1Xt24K5MQeg122I7ILiOslF9aaFjxhKq4VmlqF/FQJnSal2w== X-MS-TrafficTypeDiagnostic: DM2PR02MB1338: X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1338; 31:NBZc0lyf7WgVxCoAj8QxYjNKZzsOvRDIcJz8T0lnvE2ic5xMmQ2dNy99KrUJzg0iuT5BvcedJ7ptVy8wgdoLAh6NHa/Stz7vWQIjmq2MQBh5HGVZvKQ0FiHyuvOiCuyv3Wr3BN1+pdzHhSevgvs7ExQNdsTwBOG+tXGKwo6UmnlPHFrmYRNUlwmbpMGNnJ4h24KInRskdrCG1vHJpWnSWwi38S5i0M8PhTYDu70SEVI=; 20:2WB7sFhsar0ZI/nYTmZVnrP4uXo70ekAYV6D0HLCVO5u/35E1fvz8ci21fVERWH0idf1ZlA7hdWl4QMWO1ebc1KzQF/IZXtuO51AEexfv+sa4IPoHBopOMXqexE4XR6cbtU6IrNB6EQvGJ/eJreyh/RLuZdUwzO55ZM49i2zrhLjRpgDZx475+97s0/AOMQuIMC2QMGDlJwNQjoFKlGva0n4GwJ2lcw9x4k3FLKoPfLkNY2sWqDsSyfdZzoC08LiZ80i/t2AnKM/4zdIY9mT14r9ZDHM6d/ZVtwpjdeIQNxR3QJcWmPWUAqE65J+Gae93Ha7g0+DFAif3v5CQW2AIOn5QAdTGKbxq8+gw2ol4bg+y5Dbp+dmEVfcSJJbElLL79Y1zL+Kw9YSzTYsV5god0f3ty2/jPAN3s9D7WbMoRZmdl2VHKIgLu9yg+hUwOlFynDumIEOJa3M+H5H9J6hef62vZmV7l+8clZB+7qhpa5tvDCN1wc79cfRqZqdVZro 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)(100000703101)(100105400095)(10201501046)(93006095)(93004095)(6055026)(6041248)(20161123555025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123564025)(20161123562025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:DM2PR02MB1338; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:DM2PR02MB1338; X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1338; 4:0D6+UBlgmxrtPLTHXqGVc3QpyExxF4TkH24NMSIpnEnxGxOWAb89fUR97zKe+LE0GC8M/jxASz/zLOmj4wdKImdixJ+b/HpyS+4laVRJnod71HoDZUVVLw7GIshzX9OaIba81gVNHceKUTs2fui07xgP2skLEmdoCtd6kmw135bio90+uTqLLrDz56Q9nk1CbpcsoaaewYgSOZLz5XeMDW+ExxZ/QeP6kTnZ1YiRkBLiTcz5x3s109AygVjNUa6AK4aq8kzelMRAoyYC2hNbjDQW/4MVjoI7CM+DCs6f3dgqOaq5xVyRtCMSAviMoF4bQEqNQe+SQgabznlTDX4Q5w== X-Forefront-PRVS: 0465429B7F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR02MB1338; 23:Z9ykHUf6qedQB4Hgyq6pvi7GkX/j54TL4i7fwe22/?= F0DPfaSMo3FDH3SY/h1+ri4G0AqwEIRgvTWxt5dKqw4bwCDewaSCpJCZJAmt+PKHrxSN/D5OFs5o0LmqwZV8/pNF/VukzFTxhY7Xv+EVsLc8lHOdP6rXC68py6RGWiIH322Sd+y9MN+BpHtd3105wm8ED5utwcRrBl/9OEs0q5o86ZedYc0xFKFdaKL1C5Ez6lG4TW6qCfSyIVj7RgwmpMbnVfKrjlrBs9L7ppVxQa1aw8aabzUtfqt0sfcaqwWaq0JsTLHzBwGWoujHy1AgW6IwVTFUt5vdWsqJyH3s8uEDdbFIHibgr10qPUqPNe7rrsMKC2tQg2GJfCadB/iB9XGHPP5zUFxQGCKfXkbM/W9720wL6PtgmLDJys3FKC00Qf1kwWDFlcRUZTK0HYJYzm4sSohALrYgSvLNjB+gxEEFSkydaAbzvUGVH/LFLFBZ3lxPl9sjRlgoOc0gxZglh5aqh3shtXYECOuPJSY/uOhlK0I3SdaC5/dlnCRrH3OkJ0xbKzsilQkPKG0RwcIr/TKFjwz0S3tNaUbDaI1bPknZRSkEvB8HSvSUut4MhDurTDN9AwBLIC1oiAuksZt7yI00IlFtCpSaXeovL4+C+BL/mmp+/WQb4eEJXV0cMTfIhG2iWmlZ9hAlF0Ci7mx+x7BQHRNioNeHiGwQC1n/bLPsGAbXGVN7NFf7kNluVqZSe/d23l0Y7tyNRaKzdJMFclmagSXT7aOpH1e51L6vHEAh2G5wREDON1/LQrwb0iHzHos0uRAdUlx6BU9/t3wA1xOA4t7jc8IN7LI/QAUoUR64M+vWnVlwD2MOui79zJ1Wup0wNWvRfJ7czemWiZpYQk1ZuAfk4Hy+ZmBagDDtxFNtOVlBUtIMZsY11+OSEgH+NrWPAixSYLlCo3yP6aOMSdqTSNiJ60IOwYROlAXVxU5vd1NOAOPFc12ttHvrCfWYX1tKFQACWRh3WoBNsAhIy4Au4e40e7Dt3VgXsLthM6/f2HFIo2hBQuIdnTAx5L4mAw= X-Microsoft-Exchange-Diagnostics: 1; DM2PR02MB1338; 6:sCEXx61VU9Xs7DtBMXlDG3jxnh5QwZCrjxdCgzykWdSCszO+sGPUCdeHoH3hocO2hKCZokMS6l3qMt8Mdpj6KpnKPgfqqLcfLUnfthAKc8nYXyXfv3dCF7qASOWBqPfoIUQnqV4LAYtmbjDHe+HOs57Fg6bwC8RPWbyGU3y1Thpxtwy8EJ2muQsfAY8Hbii/xZ8nBX1fdxmb6zq6yEm4pqcD2bSniKCbmAvNPlg2i8zvpyRQolr/GzA8zCqx8a9K+Fm8uz6TeccvVWS4b+p/YpW5peZSQcdoptC8bDbqQBDfrxzs2ITpusEZKqPxCnjMCKHPloynkx6tct0Ng45Eww==; 5:iTyIwJ6W4tjZpTfp005frM/HGxgmRbXsGjj4dzF70OPGnt7QXvMDK10ZV1HH7tD4caEj20UFlPvIG7XacVVfyCKEefGNUO0b62r6DYvDJM/lyDfJ2SPvBpU8r566mlElBRsodCl+2T792jfWZfomuQ==; 24:mtx6nrE7zgbacbLbsSMwIrzEM38XV8exVmt0f8WtGUc3K9T6zkuFT6pOCfrc6Hqfv4P7mywgMkONfnmxQIVh5jUfV50SzOmC79Ll1JjXP3M=; 7:gqahyoBjpq1zQ6tiETyb9QI05NCwxCmG17x78lzw6SUgzrUpjBlodvyYZcfp8OLSf50y4Io3/9ueV+oqAAwnT+nNAhURoooPrnkAik568Oml1qiYf8PwXnYQRal0rVGOUtYutHFpVOeon6e1LFikTFz+0mVWj3v3uUL0iUfvfO9idiYsccrCpmjNkCyQ81UGQMc40xdHfFYD0HRZ1Dxn4wWAGNE5mL+iqGJbiKCvVlg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2017 16:20:30.6512 (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: DM2PR02MB1338 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.32.55 Subject: [Qemu-devel] [PATCH v3 16/46] hw/ide: 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, armbru@redhat.com, qemu-block@nongnu.org, 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: qemu-block@nongnu.org Reviewed-by: Philippe Mathieu-Daudé Acked-by: John Snow --- V2: - Split hw patch into individual directories hw/ide/ahci.c | 6 +++--- hw/ide/core.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index c25e293d88..2ed015285a 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -410,8 +410,8 @@ static void ahci_mem_write(void *opaque, hwaddr addr, /* Only aligned reads are allowed on AHCI */ if (addr & 3) { - fprintf(stderr, "ahci: Mis-aligned write to addr 0x" - TARGET_FMT_plx "\n", addr); + error_report("ahci: Mis-aligned write to addr 0x" + TARGET_FMT_plx "", addr); return; } @@ -1053,7 +1053,7 @@ static void process_ncq_command(AHCIState *s, int port, uint8_t *cmd_fis, g_assert(is_ncq(ncq_fis->command)); if (ncq_tfs->used) { /* error - already in use */ - fprintf(stderr, "%s: tag %d already used\n", __func__, tag); + error_report("%s: tag %d already used", __func__, tag); return; } diff --git a/hw/ide/core.c b/hw/ide/core.c index 5f1cd3b91f..0ea34f62ba 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -2762,7 +2762,7 @@ static int ide_drive_pio_pre_save(void *opaque) idx = transfer_end_table_idx(s->end_transfer_func); if (idx == -1) { - fprintf(stderr, "%s: invalid end_transfer_func for DRQ_STAT\n", + error_report("%s: invalid end_transfer_func for DRQ_STAT", __func__); s->end_transfer_fn_idx = 2; } else {