From nobody Fri Dec 19 21:51:51 2025 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@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 15084314343990.29382387456064407; Thu, 19 Oct 2017 09:43:54 -0700 (PDT) Received: from localhost ([::1]:50176 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5DvA-0006zu-Hb for importer@patchew.org; Thu, 19 Oct 2017 12:43:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55701) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5DZF-00055L-0W for qemu-devel@nongnu.org; Thu, 19 Oct 2017 12:21:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e5DZB-0001kP-Oc for qemu-devel@nongnu.org; Thu, 19 Oct 2017 12:21:09 -0400 Received: from mail-bn3nam01on0084.outbound.protection.outlook.com ([104.47.33.84]:37664 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 1e5DZB-0001im-GH for qemu-devel@nongnu.org; Thu, 19 Oct 2017 12:21:05 -0400 Received: from SN4PR0201CA0016.namprd02.prod.outlook.com (10.161.238.154) by MWHPR02MB3389.namprd02.prod.outlook.com (10.164.187.166) 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:21:02 +0000 Received: from CY1NAM02FT021.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::205) by SN4PR0201CA0016.outlook.office365.com (2603:10b6:803:2b::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.77.21 via Frontend Transport; Thu, 19 Oct 2017 16:21:01 +0000 Received: from xsj-pvapsmtpgw01 (149.199.60.83) by CY1NAM02FT021.mail.protection.outlook.com (10.152.75.187) 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:21:01 +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 1e5DZ6-0008Vv-PE; Thu, 19 Oct 2017 09:21:00 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1e5DZ6-00032v-M6; Thu, 19 Oct 2017 09:21:00 -0700 Received: from xsj-pvapsmtp01 (xsj-mail.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id v9JGKtCt017968; Thu, 19 Oct 2017 09:20:55 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1e5DZ1-00031z-E1; Thu, 19 Oct 2017 09:20:55 -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=G1ot332bPaAQDdY8BDwR503dQKwlzS9CZj+9JsJquaE=; b=XNA7fvUppRISSPiXbA7taJ/lB2ch7IBQAEvXL05kGldAGsgFHxL17qlubgR+c6i60y4CodOPTB8cLaILsMUwg/3+OCMgtNiqKT+yWKWcweeu1pyv+9fX5LwqZi+KPrdssgRaEAdrkJMxvh1yawVfqvuxWo/c1lf5720HK3REmEQ= 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 (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@nongnu.org; helo=lists.gnu.org; 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; From: Alistair Francis To: Date: Thu, 19 Oct 2017 09:17:02 -0700 Message-ID: <98c444579dd3fd79d76692505a48fabb41779584.1508390588.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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)(346002)(376002)(39860400002)(2980300002)(438002)(189002)(199003)(118296001)(54906003)(5890100001)(5820100001)(9786002)(106002)(2870700001)(36386004)(316002)(50986999)(5660300001)(189998001)(76176999)(2906002)(36756003)(77096006)(6306002)(2351001)(39060400002)(4326008)(47776003)(63266004)(6916009)(305945005)(356003)(478600001)(6666003)(106466001)(50226002)(23676002)(33646002)(50466002)(8676002)(2950100002)(81156014)(8936002)(81166006)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR02MB3389; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1NAM02FT021; 1:MKgvhdUDleWbw7aVn4WdTKUbqlQJuL/Rfstirw2yPN45geOk2o3kE7eKW7maNBDYPPCdZqr1Vse6dpwspM8GW1SWWLHoZHnOsQBUyLCTRrBY1tuapRpWnKKMO9EvWUSb X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 04bdf500-0f06-47cd-d12e-08d5170d63b0 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(8251501002)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:MWHPR02MB3389; X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3389; 3:rzCpBsVsv5EURSIhMNyCJ3GuQwJIvqu1dLFp9pHRbm5DRi3QOdGvbWsrCxvDxxBwintQLY6D9+lJ+fF1qFh5wqY4sMpGz8Qg1TITIwfCjoE+F0zpbQhEQ8O11KfPUP+ytHqZdXmQ41SUwcgT+Gdhk6qcnFz8limvhTPAv0ILYQtQqSw863pmewFcUp5pBQ8uhf9XXxVTAtL9LcTMsK7jmHM7kpnQg3mqmwXdWvUtsWast7lCeRTgnw1UxPC9mSW/dHgGTwEswMydGOhMpTJLDv3Uu9LNQCAVLr+vBOlYa734RSiQEQGHAPi+o1TENbH1U6teNBGCrtkhkzTIMbnieGxGBgnGjGk1Oh6+XSYZuXU=; 25:nAihbGmKPCJVhQr4YYxVW+OnIhhEnrDX3W/LPtCeO+M+JlB9cVYl0hAY0b2Km1dxVtLHSt1f4w8eQqEof5VIUL2XuOvFbAl5xiaBwPubu3kPEecSW/YOKr3SgIcAwFvj7ii8bCyNr5Qj4Jf4LUe0Z+GkRN56Qd1FG07x8q2HEcuj6uS6Sk2/vqFAQJfFqdrV1CPf3OR8qsSVYUX5AhPftYICL+qVmlBPieIU1K7vPAA4yrS9v3bpSNA6XiJnn5ClWXx7OxXqGWZ7mNv8eqRmm4Gj0D9Poadh6mYBUV0qH1EYq2AwjEVbEEOsyXN9ADpwsN6D8LDEGkm6pXpTOtxkzg== X-MS-TrafficTypeDiagnostic: MWHPR02MB3389: X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3389; 31:3XGZM5UEknmGmB97qAlSPzSTb2Dj87oRphZDtbvLHHQ4vf0BLQ5N5j62cLYt0ChoF54WVPekPZT11JIikXwIVJ7kvvisYhDe4HyYF+8P6OuPooyBBxUxw4zSsalc1/s77/JPaXBsI0PlhYzjSOdwpmgpXHo7Zyu0mHdnBk2EEpoX5HfHs+scc567zqx5RTO8ySqfAdEbcTm5bDbkDBy1Qbwqqppa/4kds8ei8ruK9sA=; 20:tq2s1NKa7HzpHf/Z+37o2mk3uNvs3aatJzdwvjx07EoPIAu2y7nvNRPAgLqsswhlMlsy2ULysq25i9Swm/2Dwp8hYnUIm9Ys/0UfgC4Dvu0Ise6Y4usEZbcldNa9T1U5q7ajuM6kJ3vl/KUeAAPKv1JoLZDeT7+/gSM+3fj4xRUx9exQ+g7KLr2TsBgDoh3SVBIWOe6H+b1iOtjyAfBNNFzKr1gMo18QwxvTImoHfErY0Nm4ULLVumPfawQeBPYWxovkcJkUmFf+d4OzPkBZSLnuwqcuSJylMOiRBVmvT5JdErj87OKCSvuDB37wd0iuTqvkwwUWIQUMwwTdKoSMeqcqfbVgNWWoRUzFq/X7clF+3yCW0fbnaUwgRPsT0tVwmWzUzuv/lujEWc48jEnXFgfLlI3TC//kr6ExGevun2AtV0lVa5Mp9BPiUupn+Qc1jxa/0MAG/AX68TEGXLNxBCOg0h+hH+kzT0SeIpvGwFgt0R8uHD89myeSLueqaCPm 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)(93006095)(93004095)(10201501046)(100000703101)(100105400095)(3002001)(6055026)(6041248)(20161123564025)(20161123558100)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123560025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:MWHPR02MB3389; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:MWHPR02MB3389; X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3389; 4:uJxVmGucbXyOpGKmhYy2xbMLeNQwGUsebRsZLZkgG6izyTfzjdQv6GWO9eWG+DmDVBrivhibwwMNLUKhczCPSwK3VHrFQsp5GxyFSfcUNqriUlq9B36lOFOxoBaY8JfoiB+hENMVljVi3ulrOHBi6kmlwHLJn/PB3zYmZGR8yvpwhz04oW57vsT446L64krsBetfN+qpQFGJHWJz6LdOYq6+3YgWGXzVeoa4zTwnhAQWufRQ2tGjzr70inKOpcA4nYcZMj9RGPQhkEAGd1bh0URXOUbDkAWE229agp24kJDO+Dl2GmVu0DMLM6lsckVPrCGhB8JZxpaYaDq4WD8xnw+CQ7YDsNWQ+jS4IvdcXOpImZflDLGXPP02hdPxeN87TCEw2Z/r38L+pRE7K12WPw== X-Forefront-PRVS: 0465429B7F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR02MB3389; 23:6xnuIYDDHRkzwVAMDFHW2R/U1uVbTFHzD+Bpf1/FE?= =?us-ascii?Q?GWI3q7XMBmlWD/4IjPk9UXzKLHFSpijR2p4cH9Cf941za0lFtBfMaG4jZ50h?= =?us-ascii?Q?bPmx4/tYMsiNKBSt4Rn7ofv+EzN1Dt+lgqZfmpPg+adtioURID7riAO+uoE4?= =?us-ascii?Q?v+zfL2cHqZHf0hq7dscV4jb7imeleaIzMTUtbK1v+JkpI6dpIR7HohR1EYCn?= =?us-ascii?Q?S1QG016eFmPVHDWQ8cKBLx1HBmDiUfADz6ufvrG1Btdh+z965WwbqocgDYmp?= =?us-ascii?Q?KbqEWvZjbXgGck/oPkQ3JjZ/QrfhN2VWwzQsQ3WDTeCv/9+kRngpBAKmj1Ew?= =?us-ascii?Q?VNcJukFs0KY2bf1oU1SjVRdRtLKkoBIID/OgpDDClSNEjtimUox5WI3ok+To?= =?us-ascii?Q?+keeJmNj17wHqbIUI5XmBghu+Oa2ykcvM6gWPEG2qDxqjy5NgtLinRvtALta?= =?us-ascii?Q?Ay0QtK/CabFJq7Zof7cwUL9eB+fQu63K9P+XT3tpFpa5LcnzXE42o2Cu6fGH?= =?us-ascii?Q?jRjMFzUt4htSAfVRAa/olh+Lji6ks7QBg9biW4Ey13HTEqmh/jdNUCELNCID?= =?us-ascii?Q?6ULiA+Dnba3PtP7e4CCAazlI6rnH3bldl/dDfqtk+qHIqaupsrFlkt9Cftit?= =?us-ascii?Q?xf4hQJrUMM5f/f3XB1atcL2qBDD2w2qSEdaEHUXEiHwqmR/L3wae6Zz/zUzK?= =?us-ascii?Q?0IxRG7NuiDyKkXC7/KNZqG/3bThQ1uRS4g9HasBxaeCglsE7/38yhEJZYJXP?= =?us-ascii?Q?JwxAPSM//SqRuoQLaGg6c2qbT19xYXVn8QzxRxk4ukv6A8Eh77qWKHBgdltn?= =?us-ascii?Q?Gfefj2OCIXAo7Ji7YOLlFfXHfyfSCDzr7rfwW7RLFcQwm3DtUtxRqprbXzKP?= =?us-ascii?Q?ud5r3X02t6eC6cIKcT0wOrObkAUWyDHHeeJ8nHQ5VrjVGIE5NRL4lB8g3uho?= =?us-ascii?Q?tL3XkDFuwHh/zx+5Dokv/W4XIjS0dXuZkQkM44KXxgoG7Xauv3kX5V1c+3bi?= =?us-ascii?Q?9InXzXPd2PqpAdFXRLUdxeyCJ/nBpLMyPronpd8DnrChQjsYS9Hx1mOZmM1p?= =?us-ascii?Q?iWEYl/Z3hbIKcQAcdAmv+vu8xynY7yd0y25qCutvvUgVz8mRQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB3389; 6:IOUC7QFA2iHlWesco6PJp633F/QjESBD87sl/mvVguEDKQMeFJX5laOWD4q4FVhAo/EKdR6wuEGejw+1cUxC7v/WXlQ4Iv2C7cweM/wEhWUuKOGTPAZ10IdAcXDWm3FumaZupD7WxhdVwrv7O4ApE8kQ2CH18RK9aqvcfjojDD/HBfUIaZdUIoYnZRofdTJrQG7bafsnqrDXFZJKAO6OJQ/bjHViqRtZx4bfu6+GPS/T3cdCeTE9fmuLPF9rzlqBa54z9eb+33B45KXNVf0pVk/BvxhJD1a/Nl60ovfM7GBFrcOx2Q2ajhDf+ZSubbWATl91yUwOp9VXunV/vPnxdg==; 5:+gSrJXWYjOYj/yfrgEm4VnSjzf6ywSNE1o+pT7HVuErfHxLaBokDxJ6ahjfEatUHHlb2NGXmkLcTvdW/EsXWjJFtZUDfxasI9WqPsFTh39VNJOto9nIO9dmIYQDqZUdfwuyjLbUhGmfVS7BDOQj50Q==; 24:tyHAtXSTNQ6sF939sdG+ihrOEf1rx1Io69+tr3TIUGzjRQu491cv+0/7OlBbx+OSSm3jYVwOM3dWnCQADEQKS+G6BC4asJJEGq9cJbgKzu8=; 7:MRHgMgqYhOjHa1MN/5evjON1oNJELT2DKI0u0YAhHntoxnhBUhZIM2JziK0p2dj9GV5bZ9CHCIhl4fKlZMaETB5WYsYjK+Lt2pZX3/t6ssD+3r8LszC/qE6JhGXPVUrySMTorr5pqE5XefomZS2G52ViwyZUM56+ne8Wer14KmM27eWJcu8AZhTkbCMfd9/Qsv1TmnOVhrWsub8MoEKvlLZ8aBVeFhUX3Ho8NCHRaQ8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2017 16:21:01.4370 (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: MWHPR02MB3389 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.33.84 Subject: [Qemu-devel] [PATCH v3 24/46] hw/misc: 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, alistair.francis@xilinx.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 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