From nobody Mon Feb 9 16:34:03 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@gnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1506731838278500.38397077464776; Fri, 29 Sep 2017 17:37:18 -0700 (PDT) Received: from localhost ([::1]:37564 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dy5mJ-0001w0-3T for importer@patchew.org; Fri, 29 Sep 2017 20:37:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60382) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dy5Vu-0004Z1-OJ for qemu-devel@nongnu.org; Fri, 29 Sep 2017 20:20:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dy5Vr-0005gg-4S for qemu-devel@nongnu.org; Fri, 29 Sep 2017 20:20:14 -0400 Received: from mail-dm3nam03on0050.outbound.protection.outlook.com ([104.47.41.50]:43279 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 1dy5Vq-0005g3-RH for qemu-devel@nongnu.org; Fri, 29 Sep 2017 20:20:11 -0400 Received: from BN6PR02CA0098.namprd02.prod.outlook.com (10.161.158.39) by BLUPR0201MB1922.namprd02.prod.outlook.com (10.162.239.156) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Sat, 30 Sep 2017 00:20:08 +0000 Received: from SN1NAM02FT028.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::202) by BN6PR02CA0098.outlook.office365.com (2603:10b6:405:60::39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.11 via Frontend Transport; Sat, 30 Sep 2017 00:20:08 +0000 Received: from xsj-pvapsmtpgw02 (149.199.60.100) by SN1NAM02FT028.mail.protection.outlook.com (10.152.72.105) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.56.11 via Frontend Transport; Sat, 30 Sep 2017 00:20:07 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:42396 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1dy5Vn-0000F6-2k; Fri, 29 Sep 2017 17:20:07 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1dy5Vm-0007NE-TL; Fri, 29 Sep 2017 17:20:06 -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 v8U0K2dd031011; Fri, 29 Sep 2017 17:20:02 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1dy5Vi-0007IH-GQ; Fri, 29 Sep 2017 17:20:02 -0700 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=gR+QkUGKX8a99Fc5j11/n/IWxy/Ex0ZxzrVDNYSrqdA=; b=c3/699BuWCMbAEkzxkkEp6wrwiXTfeuHYs7j0unLWqJkMqGRjsXAD+Gfyxi6QE15g8cVzg3N3dNRRDM7Q5B8h9TKKe7W2m9cL/nIzaEdhzq9mItJ0hsMJAyzh/a2GjfpqMYk/LrY8La8RiBRFqK8wYkHy0OVWnvmTDdOo20VBlY= 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 (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@gnu.org; helo=lists.gnu.org; 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; From: Alistair Francis To: Date: Fri, 29 Sep 2017 17:16:15 -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-23358.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.100; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(376002)(39860400002)(346002)(2980300002)(438002)(199003)(189002)(50466002)(8676002)(48376002)(316002)(5890100001)(50986999)(36756003)(16586007)(76176999)(2950100002)(2906002)(106002)(9786002)(54906003)(36386004)(5003940100001)(6916009)(478600001)(50226002)(305945005)(356003)(5660300001)(47776003)(77096006)(189998001)(81166006)(33646002)(6306002)(39060400002)(81156014)(63266004)(6666003)(106466001)(8936002)(4326008)(118296001)(2351001)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR0201MB1922; 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; SN1NAM02FT028; 1:uwOUDZjKon4MGDsf7jFn1qzWIvGAlApoPK9QxP2j5JjDF12/iKeURMPaK4rIz151dLFyafLyTWidvE76XoKYFTE7J3GiIVTrTlaksURPiLeCyiywmH1e9+0DAIqQb3ZW MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6d0bbb1f-4271-4471-6473-08d507990179 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(8251501002)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:BLUPR0201MB1922; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0201MB1922; 3:ncaVLxGqH3QCyg8HW7I5jRe2rU4u44kH9+7tERvny+7a1tH5cY1EfR2i6eXJuKdxftGWt7pIlFdpPizDtEK/wxNLcxpv9bhQWRw360uc/JQAeYSBGbh5F9lV6YO9J8K4QF/D30MpxFdFQgkfafIPMY6AE+D8pMnLoAo+USo6veLPmEchf8GACqIA0ANOBYgUbmiX6uoHf2qrJu9pmYovDCH+TOCRz+ukz9PcZkc+p7zg+HkQ5QWkYYxQdBHWHIEdIXFSbqlroZuUZMIH4C+vODzcehPjZu4PWZyPuxBPbJjNweGkMFPGtJCsOSc6tXI5ahsMYkSrvcUD+9IyeRv2mr5zRaEarqIFv9Oi/wbB5ao=; 25:DaFWJk+/3unKQqV5s8serb6TCWtDuUsbO/7MqDNO5XJUehIJ4HHqvgwQVe9UY+Kdac4r+eqg7o1JY+Pcz/w9L+MFILYQUEh2lbjCswo6gCiDDA3EVmJyFggbDKYfqK+XHd56MHPyrIpZ6FLdwDj5qRnB0w01eDOylOl3/pXLHEJBvdj3W+13UkY6suhtzdtkU5Ox51cBOm/QyrH5/Y2ZDoH9sHXwa6RXduKu/sCVj7aAiFU5OYhMXMFHWh04i7wxB/wbFgieRnZVaRd7dXvR/tKlhMkkokM0pJyM8iGLdkmNRfIVBFGyKwDWsWl1i5OK1Da7A8SbfmOAiRI5T1rgbg== X-MS-TrafficTypeDiagnostic: BLUPR0201MB1922: X-Microsoft-Exchange-Diagnostics: 1; BLUPR0201MB1922; 31:GEHktDHVHsKzfDlE9Txn9btVtJYfKXLLVxA98SfGpg/5TQAoLqc3cpK3r4lxdwMjVP+lJMIbVF78O173/+6BWo485+ACiVsaCPyf8RdF3G4LYcWwZX6FXK6977hPnE75flitrwU7YSd2Dju9KO4W/T8I/L3P/dyNOv7lXKamLixLT20SQi5OJz7SUmIEcC/UBftCV4ZpLVhXaQrhZzGrilWNirtBCJ9LCkT2Gbff5RA=; 20:z8Bebdjm2FsQFYjFhU3QXu1s3qugZuqyS36cFt4L8y/ZfshxBSfJXKycX/U9T3IGtjfSXv/WSyP448baY0CCH1/xRqrXHFgu1ZFsuSNIpTY+UHQTp9A0QI+CfCWF8ByF1UVl39DEl/RwiZtTh0tEyyNbLTSnwmQfWVxiGjkthp77VIls4alLTH+WwnyVo8feGxl4zszDmcUr1TkD1HPs5VkD7fnxyD9RbSJySc7C7CpWqjFdYZAp9dqRps330bYWFtEY9x5L0Ek2OC1z98wUar+L+xnHo9/c7g1jjvI5O7EqfWnM41s1s0fG+BxbwIxuq5xpxMK8mzaixfhNXdsQfazymOwbVgAVgAjE8Ky9PWJQIK9Lz6gwtaQOJy8ccCqQi+si9U5g8TQdqC7871jMQcrmXjHgJt1qcjqBAEWpe4GeGDL7w24kbAQzKWgSD8YBUIKB1xB7xd9j4Iqd/jzam62F2l5dVNlOvdJUCkBpId3sgFXkR4JZKhlRYufjfFgJ X-Exchange-Antispam-Report-Test: UriScan:(250305191791016)(22074186197030)(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)(10201501046)(3002001)(93006095)(93004095)(100000703101)(100105400095)(6055026)(6041248)(20161123560025)(20161123562025)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123555025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BLUPR0201MB1922; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BLUPR0201MB1922; X-Microsoft-Exchange-Diagnostics: 1; BLUPR0201MB1922; 4:toOQPAoZOBZ+E/zKZK6E+a1ZT95ISb23D4icsPaqTB48xUjcobXq/fwmjCd59qFEguwgw22FOMLefScLmPy4drLGsBEBNJrAejsDGMYiEZk3GOUNfQbvSCIYV9p53REjZoGPphVOEjKg760aZ9xrzffymLho5W3b6AY52ZkGIs+bkiJGok6POUWSPiqLGgsW+Asucymta5zGHH/pZn3KEze4/v4Nbche2Zvb5s0N1IoYa35gQH8rO6i6cHhUpEoh/4iCu7to1i+KUK8QAx9kTYyiNBuf6xIAKYlNx1zPxt6sTJevNThaYbr7Ypcy9t4O79BxuQNt/6riHCZPx2gJ82K8IjVNIO6GA3sqk3GGFMHjo3VwMLixxNT1M7/05ysj7n4yh0mkhrZg8mdeXBackg== X-Forefront-PRVS: 0446F0FCE1 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR0201MB1922; 23:1ZuPa8cnAXIoAdWigGUVJibTIoOsAk73x9YfTUt?= =?us-ascii?Q?GbmdoqXCXv2L+YUQLciVS2d5xkLBSAlTx35++37qeV6o6AyLjlLgYHDuVibB?= =?us-ascii?Q?NrhcNXt/fHoFcRoNRMgBMjv6OXHoGXbEKQTtSsgbbGXSTV12fN+SEMnvCdUp?= =?us-ascii?Q?8lOCThiRwOlCbqo6gfq3cuT0pbpxVou94uCKnZ01t+IGQgA4aQ8pVUTlfMNh?= =?us-ascii?Q?fc/iC3suDfO+yRCnMoHfgQNilrymICAr0wAydTpjOQalBiLOwD3tdzz12yIM?= =?us-ascii?Q?zxtgY6C7x3Q/cgK40JsMXGixCwjQ+ygggZ220mO5fos70vBbmpqU5wgTYJyV?= =?us-ascii?Q?pkeir7+fqjGAkEHuVEoauaSuwIHCJvd6DRbWGlRw9c4fefxZTbNsVeQ3NUfA?= =?us-ascii?Q?HBNjDGZuKE+wG4ou8SfbF8DxWfMsx0TI2us1IABYSwWaC1MsLoay8QRvpdie?= =?us-ascii?Q?7CBHHXGLnbYbCo1RQNzbT/c3vPz6GquOzkf8cbfbWdB8Zte4vzdLEAVE8swG?= =?us-ascii?Q?L07y11M9C0fIgp7BCXEqTyP+R6+HM9nxIgpTiMCoCOao5k9+SVNdmbB7RB9U?= =?us-ascii?Q?Cn73ree50vKuVBPOxb0HPgfnARpdUMQPGHijlBAZt4fAms6zJhKf+NzVw+px?= =?us-ascii?Q?yn2jYkc3KF9t18pRUhDEF/6izA7GHdzafKWGr2Jz0CE55CeSxLrWtyIhYw36?= =?us-ascii?Q?nit/zI93szPkiUXTyOMwmyMKl8DXkXam2GepHACssO0mZxC8L440Xc5XzmKi?= =?us-ascii?Q?li5x2s0VEpZUVPEl1YR9+Br2979elEk3GelnmimwzMKGdRB5W8ZdWxd06/Lg?= =?us-ascii?Q?CqQlnxb+IjQTXFirrfkKByYcPtaHaogaK1/g6l7QDD5j+lXmZYv1M7r52v9R?= =?us-ascii?Q?8AGRXojpCjjeKnzGvmr4rkTLohqYwcorn573iGMw+pdh2SlfMOp9eCR8aSAM?= =?us-ascii?Q?5KN6KpDjsCMfRiIH0/ngSEp3QAZXIsVm7O9yGru4xly83DJ7AKeOU/gB5Phv?= =?us-ascii?Q?Q1T41ju489UoZ/pBavaRVjPm5kWzfzM/fIArrodMY2U6qij4O8MdBEXKS5tA?= =?us-ascii?Q?d9T7MOhvzoxEBLrbbUH8Vt5a2qDvV9Tcnwto7gKIVSzryam9C+CMpBhtyYch?= =?us-ascii?Q?RYUZ56s3tFus=3D?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR0201MB1922; 6:CwjURh7K2Jl6BxJ8mDxnyf6hfCqSH/J74h+osLIpTGl2gs9So9s0DhRGxtikJB+gH8aLGgshGLeaM3cl6wH6mv+rSy5zQN/L5Rl7R5YNrcMmZBC/EzGxUSAOjKPLb70b1o+RBXv8QsLm15XtqB+A5UXCR5S1EWw5CE1NJokjD03ziI62EEgOa91TF/A2fdzJNn1FLm1jwYgmAkUMv7zK1KBLoySsItrZVb6iLIos1XehNXwMaE48Vy7ulJ92wDyrzGfvRLM3EjKwP+RbekH1UEi2vjBgTJfi9XUdeWexdwylHN3dkBOn6nV/Fu6ifvmpGobo/Lw6jDg8sGbrBDf8HQ==; 5:EzbWYU+qENtS6qbytmBM0VSp92b30Y0ssMlonuaS7prYO8TBuxBR/s2fJouczsOR0Y/zq3X7UU6ixSZqQaTAVXcuT8wJnkpw8ayhsBdFTN1Hl1FYUqQJBg3fQR1bEDNi0pvoo9E9R4KOjnwLCmjqZgovq71BkCb4U/5eE392yv8=; 24:D4PObv3PwM3E0yeYC983EmVS9aaMGZzjbg/VKoCRVkYD3RaMDaYluZTXRJCiMdoRRcPmMG7HsWD9EYsXatjYNLEpZTs0pKiQOKSWf9DqCvM=; 7:5s7aGIAgWtbWI3MuYfsnASslCPdXXUXNvHoktEi1Jv/kM7y/9qnK+f+ZhhGFT+UhNP9NLGYGXucID1S1tiFHOySb/WXYo/uzFlZkmcn+iwsSNRFII2EX3RldGIfVQVt+Dr2Yg9Vn4jKkU17+u9OfRPiaV+v4WN9DzpiSVkEgRjR6AV7y97T9ADYqxhjM3XLRVVtbscP44gFrgVIbY7ZEyEDUmjB54iZM3ZseXIvou8Y= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2017 00:20:07.6729 (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: BLUPR0201MB1922 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.41.50 Subject: [Qemu-devel] [PATCH v2 25/47] hw/misc: Replace fprintf(stderr, "*\n" with error_report() X-BeenThere: qemu-devel@gnu.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, alistair.francis@xilinx.com Errors-To: qemu-devel-bounces+importer=patchew.org@gnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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_re= port("\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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- V2: - Split hw patch into individual directories hw/misc/a9scu.c | 3 ++- hw/misc/omap_gpmc.c | 11 ++++++----- hw/misc/omap_l4.c | 5 +++-- hw/misc/omap_sdrc.c | 3 ++- hw/misc/vmport.c | 2 +- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/hw/misc/a9scu.c b/hw/misc/a9scu.c index 3e8ad8cd73..21b8e49b6c 100644 --- a/hw/misc/a9scu.c +++ b/hw/misc/a9scu.c @@ -9,6 +9,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "hw/misc/a9scu.h" =20 static uint64_t a9_scu_read(void *opaque, hwaddr offset, @@ -59,7 +60,7 @@ static void a9_scu_write(void *opaque, hwaddr offset, mask =3D 0xffffffff; break; default: - fprintf(stderr, "Invalid size %u in write to a9 scu register %x\n", + error_report("Invalid size %u in write to a9 scu register %x", size, (unsigned)offset); return; } diff --git a/hw/misc/omap_gpmc.c b/hw/misc/omap_gpmc.c index 84f9e4c612..e3b30e90ea 100644 --- a/hw/misc/omap_gpmc.c +++ b/hw/misc/omap_gpmc.c @@ -19,6 +19,7 @@ * with this program; if not, see . */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "hw/hw.h" #include "hw/block/flash.h" #include "hw/arm/omap.h" @@ -408,7 +409,7 @@ static void omap_gpmc_cs_map(struct omap_gpmc_s *s, int= cs) /* TODO: check for overlapping regions and report access errors */ if (mask !=3D 0x8 && mask !=3D 0xc && mask !=3D 0xe && mask !=3D 0xf && !(s->accept_256 && !mask)) { - fprintf(stderr, "%s: invalid chip-select mask address (0x%x)\n", + error_report("%s: invalid chip-select mask address (0x%x)", __func__, mask); } =20 @@ -642,7 +643,7 @@ static void omap_gpmc_write(void *opaque, hwaddr addr, =20 case 0x010: /* GPMC_SYSCONFIG */ if ((value >> 3) =3D=3D 0x3) - fprintf(stderr, "%s: bad SDRAM idle mode %"PRIi64"\n", + error_report("%s: bad SDRAM idle mode %"PRIi64"", __func__, value >> 3); if (value & 2) omap_gpmc_reset(s); @@ -806,7 +807,7 @@ static void omap_gpmc_write(void *opaque, hwaddr addr, break; case 0x230: /* GPMC_TESTMODE_CTRL */ if (value & 7) - fprintf(stderr, "%s: test mode enable attempt\n", __func__); + error_report("%s: test mode enable attempt", __func__); break; =20 default: @@ -864,7 +865,7 @@ void omap_gpmc_attach(struct omap_gpmc_s *s, int cs, Me= moryRegion *iomem) assert(iomem); =20 if (cs < 0 || cs >=3D 8) { - fprintf(stderr, "%s: bad chip-select %i\n", __func__, cs); + error_report("%s: bad chip-select %i", __func__, cs); exit(-1); } f =3D &s->cs_file[cs]; @@ -881,7 +882,7 @@ void omap_gpmc_attach_nand(struct omap_gpmc_s *s, int c= s, DeviceState *nand) assert(nand); =20 if (cs < 0 || cs >=3D 8) { - fprintf(stderr, "%s: bad chip-select %i\n", __func__, cs); + error_report("%s: bad chip-select %i", __func__, cs); exit(-1); } f =3D &s->cs_file[cs]; diff --git a/hw/misc/omap_l4.c b/hw/misc/omap_l4.c index 96fc057b4e..47d9c10aeb 100644 --- a/hw/misc/omap_l4.c +++ b/hw/misc/omap_l4.c @@ -18,6 +18,7 @@ * with this program; if not, see . */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "hw/hw.h" #include "hw/arm/omap.h" =20 @@ -126,7 +127,7 @@ struct omap_target_agent_s *omap_l4ta_get(struct omap_l= 4_s *bus, break; } if (!ta) { - fprintf(stderr, "%s: bad target agent (%i)\n", __func__, cs); + error_report("%s: bad target agent (%i)", __func__, cs); exit(-1); } =20 @@ -151,7 +152,7 @@ hwaddr omap_l4_attach(struct omap_target_agent_s *ta, hwaddr base; =20 if (region < 0 || region >=3D ta->regions) { - fprintf(stderr, "%s: bad io region (%i)\n", __func__, region); + error_report("%s: bad io region (%i)", __func__, region); exit(-1); } =20 diff --git a/hw/misc/omap_sdrc.c b/hw/misc/omap_sdrc.c index 7b38c5568c..3dcabc1e00 100644 --- a/hw/misc/omap_sdrc.c +++ b/hw/misc/omap_sdrc.c @@ -18,6 +18,7 @@ * with this program; if not, see . */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "hw/hw.h" #include "hw/arm/omap.h" =20 @@ -108,7 +109,7 @@ static void omap_sdrc_write(void *opaque, hwaddr addr, =20 case 0x10: /* SDRC_SYSCONFIG */ if ((value >> 3) !=3D 0x2) - fprintf(stderr, "%s: bad SDRAM idle mode %i\n", + error_report("%s: bad SDRAM idle mode %i", __func__, (unsigned)value >> 3); if (value & 2) omap_sdrc_reset(s); diff --git a/hw/misc/vmport.c b/hw/misc/vmport.c index 165500223f..55369bd180 100644 --- a/hw/misc/vmport.c +++ b/hw/misc/vmport.c @@ -80,7 +80,7 @@ static uint64_t vmport_ioport_read(void *opaque, hwaddr a= ddr, if (!s->func[command]) { #ifdef VMPORT_DEBUG - fprintf(stderr, "vmport: unknown command %x\n", command); + error_report("vmport: unknown command %x", command); #endif return eax; } --=20 2.11.0