From nobody Mon Feb 9 19:30:06 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 1506731294891365.6841922338609; Fri, 29 Sep 2017 17:28:14 -0700 (PDT) Received: from localhost ([::1]:37521 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dy5dc-0002u8-5M for importer@patchew.org; Fri, 29 Sep 2017 20:28:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60086) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dy5VG-0003wK-JE for qemu-devel@nongnu.org; Fri, 29 Sep 2017 20:19:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dy5VD-0004Ts-BN for qemu-devel@nongnu.org; Fri, 29 Sep 2017 20:19:34 -0400 Received: from mail-sn1nam02on0057.outbound.protection.outlook.com ([104.47.36.57]:44405 helo=NAM02-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 1dy5VD-0004RF-0n for qemu-devel@nongnu.org; Fri, 29 Sep 2017 20:19:31 -0400 Received: from BN6PR02CA0091.namprd02.prod.outlook.com (10.161.158.32) by BN6PR02MB2689.namprd02.prod.outlook.com (10.175.95.15) 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:19:28 +0000 Received: from CY1NAM02FT062.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::204) by BN6PR02CA0091.outlook.office365.com (2603:10b6:405:60::32) 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; Sat, 30 Sep 2017 00:19:28 +0000 Received: from xsj-pvapsmtpgw02 (149.199.60.100) by CY1NAM02FT062.mail.protection.outlook.com (10.152.75.60) 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:19:25 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:40095 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1dy5V7-0000DZ-6I; Fri, 29 Sep 2017 17:19:25 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1dy5V7-0006vg-3T; Fri, 29 Sep 2017 17:19:25 -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 v8U0JLdm030558; Fri, 29 Sep 2017 17:19:21 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1dy5V3-0006vQ-Hf; Fri, 29 Sep 2017 17:19:21 -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=kzx0xpRb55y8M5Eh3CiJSCyKx1d/67mXusuot29jg+Q=; b=DD2Fa+qshNvuM/FFh3JH17+tMwH/c+SW8volqL0Jqymnp+9F8CwyBQIZpYgT0pNUVr9TZzTrwk7ezEow4GZ0R25zi33t/jx/+/8794rwSa5RQpKUiy53dHsDEvwIq1SgNdrtttzOaAGfSWg14fUpkMlvjZRU1CGUhYQPRixxApE= Authentication-Results: spf=temperror (sender IP is 149.199.60.100) smtp.mailfrom=xilinx.com; redhat.com; dkim=none (message not signed) header.d=none; redhat.com; dmarc=temperror 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: TempError (protection.outlook.com: error in processing during lookup of xilinx.com: DNS Timeout) From: Alistair Francis To: Date: Fri, 29 Sep 2017 17:15:34 -0700 Message-ID: <5ba7d5ae2fe63076af88d72ec4e2d410bfbd21e4.1506730372.git.alistair.francis@xilinx.com> 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)(346002)(39860400002)(376002)(2980300002)(189002)(199003)(33646002)(189998001)(50986999)(53936002)(47776003)(36756003)(9786002)(50466002)(2906002)(6666003)(76176999)(48376002)(5003940100001)(2950100002)(50226002)(118296001)(106466001)(575784001)(63266004)(39060400002)(6916009)(2351001)(54906003)(8936002)(5660300001)(81156014)(36386004)(81166006)(356003)(478600001)(305945005)(8676002)(16586007)(316002)(106002)(4326008)(97736004)(77096006)(21314002)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR02MB2689; H:xsj-pvapsmtpgw02; FPR:; SPF:TempError; PTR:ErrorRetry; MX:1; A:3; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1NAM02FT062; 1:IoOj/hWUH2Wi1t7hOmz7Eh/zdbSmrnCJJ7yVZlV5lC4GDpYfKY327Vp0pr2AiJolQ08QcM6PAYMGpHTdVCINxcflEKWZxOX5c6laxUKjOduVVhqhDBMsfNSyIgLWfZFO MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c59558d1-7a8f-49a5-19ad-08d50798e8a4 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:BN6PR02MB2689; X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB2689; 3:gntHScP7bxCnrMx3Y5FCUSCYDQAy31/OigkMN85Dcn/pH9K5KzrNFprUBJZ02dK4CfUKZ9lxfhsSM9nRc6fboDvaKaMu20EqRW3Wp7scd627Hgbmy2r+/MqnXWL2xVybwsgnL+clt6bSViWa2DSNwvzqBFMtg6XYTBVnHi7ubEE808k8ydrVm5QEXKPAeZxY0+1vP22YJwYA3yWRR5JbVtRfD79LDiWYCeFdr+k/NM+srNSfGOSYs5jQ9+Xzrdfwh5EcbsJEYyu4aJV1ypJOuiUTOfiuWi4j5KUQb2zg1hQkm93IhJTN8g7xzUwWrAdLiyF4p+VY+yRijvtoqKnStkG2hSgxB87jFoLxRSlC07Q=; 25:6Nod94wD1/bLfhmexubtC64abzJ5LLtUSRwVNufk03rjL/XlBn88hsF4T5O2p2n72JdKAHuUATB1o8O98kTQulrZTZpKVdC+T0UHuLxnFd3FPjdXahe6BHW9ZJGtw9keE2hkTq7U28DPCXB3yp60M9M405JrNjIYmMj2THpgAjsyPrKzY1G0ANWjOHuFwuRgj/lsNfsTxui3UYeT+bCcdUun6P2hHuhp6ZcwsH3sVlXmgEswzJRz/A1PRzR/YRKwGiUJkDHI00hf0vSwmk/dNEWuJahhQf8QvsTi4wjPZNp9BWvdTxqCtYBR1obdVok8dBGjNoDXYrlUptqxCp2B0w== X-MS-TrafficTypeDiagnostic: BN6PR02MB2689: X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB2689; 31:FJA6sOshPN5fKPIpm341hCSYSVTG+5zLd9E35akP/6FGMmMYITMnAXWuim6m+P7M6wZP/0QvHj15bVOTn/P1pJ9/n64gkLyQAOq00bOwdUJJeZGxLwbdewrTec7MtMuYgCuR+OzZAvqhI8H41a8MJPFJmobnOwfjMAgu1rY2ApemUaWdZIz5U8eXpzcj/ULwxZZWMejWqRjyi5cLXJq7BCq3E7mLTKb9Ylavsv4bdBE=; 20:1mHy6ZKq+CtOAq6kIumxQe15Meh92CVyJILIGmLcMqMVYEDcljRMFoexeDKqS/8ltmgUK+ogPbvY0f5+PE8FL6H+cJvrm8swtUm2g5iZ7UBu5Lt9Ha01sAr/cqwiVdT9p0Bj41K4noX3pqeo9yBcHotxzqwtoH4BnjrXb9ip+1JSFk90mrTPeFlehUZ65sHtFiZPjB9nOksJWJvQ+lspf3EyTBMz4i3wRsguxPBj4pQvXS8JbNhb4OtZ7zmnPwgThFouBB7XxWQRqETqOzbAKezOMIRML6O6PFHyoeUo4xc+GmYvLF6xbo7+utVjL+BMP/6AwQ/zERb8UMTv3z+pNHebrPk3kAAAzW/PUNcDhDfrU577SAU56BH6co1Ua3eoaQBAEJw5OvypfKqCj+SK0QxIEadqAdUAI1APPTDRVLjO8HKuEqbsknvUzQbVgJIKGFqsqnureYXYRWYfu6TJf0wWWFHgYjqLEJVwTeYuWQPURavU62gDs3m8xy2Mn2HE X-Exchange-Antispam-Report-Test: UriScan:(158342451672863)(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)(93001095)(100000703101)(100105400095)(6055026)(6041248)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123564025)(20161123555025)(20161123560025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BN6PR02MB2689; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BN6PR02MB2689; X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB2689; 4:Jp0OtboCykzD3sdXzcZ6Yf4wm6V6NWutWTZMWIeQ93093PMbdERdR5Z7Qd6632wzgdUtgyd9OJMhL8SpUYfAUNGlAi+gW3KRUikxyZ2kPNdhjUfIvn1WUCO6OLezCL+RvZrT2D5w3J0V2iZXuMuA0xtKl6FpXRWdHam3z5ajQ2P5ehMN3+PneY3WAj6Kn5nQFqN1G4O2fGEn0SKL0D2oecLuqVFNqUvSI6eTsHts85ITl3r3NIMKVkTNl88zA1LANUW1Dg69phXBBudMRFt204uHa2IU/2YGwqCg0RLecjKrvXT8RfF2QCooJOlf5/OpavpWCD+9/fvyrRwbEJgoXFM87NCIGE4ab3Fx4kHOB+A= X-Forefront-PRVS: 0446F0FCE1 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR02MB2689; 23:25FhW52ZSvie4KOyq/vXz8q/SoY7hV+Mi8/cs8U2z?= =?us-ascii?Q?ZKYDR+/A55BHZYF5V3JWxl1JNF31NV04hM//zaMCoDuygb/We2tbKvvA5TDm?= =?us-ascii?Q?am+9OF88V10rI1p2Lt8QdrA9LLfhw4CV7sGk0TAjvroyzrahUBOhEuohTuzv?= =?us-ascii?Q?PZVxRaU13s+dvYPQS3ILssqESqK7x1Pb3Hj7YlPlfBTr75y7ZOegOR5WxDaY?= =?us-ascii?Q?VfCCzQ1JBt+zEoMBYGdhS6SSw+TJA6xQziu2Psn6BQPSvv811OJXltYC1/PS?= =?us-ascii?Q?tp0k43M9WSESm9g4feZZVEwNWSEyz1vg/rp30w7ZXKLxiQIESU+D8YPCrKqG?= =?us-ascii?Q?BtakLJ06OPcChuRlt6yj03ANV5PfCTbAC7smpBnkebOoJP43z1Zf0Htq86/y?= =?us-ascii?Q?ZHPXfJwlbFT5jPx2rzYXwW6Q7mSimReyeMeujzjJ8S8FWsRWkAGIZAyiUUXV?= =?us-ascii?Q?FFBAormYfUY+fwjvpXMCdLmlIQmOQH04nIuKNVfnbil9/fFPShc8U1nKp1m2?= =?us-ascii?Q?BENK0ryit5iI4iePE0spYmTFiY2lbN4TwgRO6xqyOI+ppOehfRC5qMqFpuUE?= =?us-ascii?Q?DLUsCoTYSx5w5s9P57Ktl/NQW0SogqO9v+Om+z1LuPUg4N8KeB8JU3v2iYkd?= =?us-ascii?Q?Tv5eOJbdh7AtVdVvNSyPk8tdOc985z27fDmyTg8t1KgFMsk3HDJEM6+ImZSu?= =?us-ascii?Q?vaGl7LVsU4seLM1YCdHJx9TrPGoTMZmyTBWJA38NRjqq7DhAFIQJqj88HLYZ?= =?us-ascii?Q?fsSFKwaqGnh2J/goMFy/ST4eghW4Mfza8mg1Hu9jQKaSJ8TYKjctTVKYFpqv?= =?us-ascii?Q?SXy+RZ08QAr/ptjMUTwrU3R+X6hPTCbRHdQXzFrh2HcXtGhAuBtm7nxZK57E?= =?us-ascii?Q?raw2oBmnP/gNjO9+MkJp0FktNgDmm2rIIHI4aBrFlCJw7ejAp8mnsRIAMCWk?= =?us-ascii?Q?i6QuaTtky5rmQzOAVW13XzQTvJeIh8PrDql+DymMGGN0sSz15Kt7o5MP6XwG?= =?us-ascii?Q?l1DpoNrUZFrZky6HJr4txktoZh9RCOZRsq2K1joYHFZfO6DRnGEw8PiMuN/1?= =?us-ascii?Q?mFKtbLT4kmc0t8jANY4FeyHYsxTxFrPUGVY2/Md5BtlIvThVepGrcguHaJrY?= =?us-ascii?Q?Ivf3968qZE=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB2689; 6:YxHZAacjXvoEPJQE1t8tRNj1qshC2wjVYq4TRVqW6l5FloRGu9YscUCCUziQPjfBDF+rY/q/YLxMHGhKgyNr/f2QbYvGh7cTGG31ML1KJjsKCmUA7t4sEqkKikrRTh1eT6xRa3hggU6p5jma7ZCOg60Idt6iqsJA2k/t6znXV90GRKwGyHv6JDnEm8mdJ7lkbFtolIUkxcFJQH3ZGcExVWf/QYttu9nr2VTJYmIc2f1qoM385XWdiNeuep/hnVGZn0hrtn16bTqmbHg09E43OFOjGHVLfdNXTOx7OzUkn3yzr6UZxGchnVM8A9iuCHDldyD7Ugk4SJ2VCUAf5QELcA==; 5:MDm1ojkjYJYdQKDhqnpSdxaQb+nn71O60bfdqPY5Mm1rCPiyjK+94QAYkNlgU/7MHknJRGayR0VIeUIi4SmWykatpJVXqwAIIkCI/Ko9yY1+2I3xVh5R8nlL+JgQLWX3UW3YA4S4ju/CPDKZxIwZXdJp+AipqZxFogzVnElo2HE=; 24:2bTUekDbONQdF9QCSaXo/pstrIqJFT8lGjBXoKU75PQKTigaT8AYth7bdEPTJF9imKTZwN96jwD7s8j4puxT1sQoVheJVtUhPOYzlOoo9Mw=; 7:N8OEekosZTVNykvDivim7hFxFqo4GWXH5YUu7yXz1WucXy/9xT9BcklKb4XwSyctCgQCPmXZrEdMsNQJu55Psi0zVFkkkzRVqxmKta1dFu+73M3ejvJiko49PCjrMHK2IXr7vIy8CYm9PbGqX2hgtAS7R8keUuuVTJDP9IHke8NgfYC0uGn3C2zkLki81hdaozwmJERdJ3wO2IYDPdwjYEsV2xHk/xUr5XH5gjLU5BE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2017 00:19:25.8378 (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: BN6PR02MB2689 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.36.57 Subject: [Qemu-devel] [PATCH v2 11/47] hw/display: 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 --- V2: - Split hw patch into individual directories hw/display/blizzard.c | 20 ++++++++++---------- hw/display/omap_dss.c | 14 +++++++------- hw/display/pl110.c | 2 +- hw/display/pxa2xx_lcd.c | 2 +- hw/display/qxl-render.c | 7 +++---- hw/display/qxl.c | 10 +++++----- hw/display/tc6393xb.c | 36 ++++++++++++++++++++---------------- hw/display/virtio-gpu-3d.c | 4 ++-- hw/display/vmware_vga.c | 22 +++++++++++----------- 9 files changed, 60 insertions(+), 57 deletions(-) diff --git a/hw/display/blizzard.c b/hw/display/blizzard.c index 291abe6fca..0d12e078c4 100644 --- a/hw/display/blizzard.c +++ b/hw/display/blizzard.c @@ -474,7 +474,7 @@ static uint16_t blizzard_reg_read(void *opaque, uint8_t= reg) return s->gpio_pdown; =20 default: - fprintf(stderr, "%s: unknown register %02x\n", __func__, reg); + error_report("%s: unknown register %02x", __func__, reg); return 0; } } @@ -501,7 +501,7 @@ static void blizzard_reg_write(void *opaque, uint8_t re= g, uint16_t value) case 0x0c: /* PLL Mode Control 0 */ s->pll_mode =3D value & 0x77; if ((value & 3) =3D=3D 0 || (value & 3) =3D=3D 3) - fprintf(stderr, "%s: wrong PLL Control bits (%i)\n", + error_report("%s: wrong PLL Control bits (%i)", __func__, value & 3); break; =20 @@ -541,7 +541,7 @@ static void blizzard_reg_write(void *opaque, uint8_t re= g, uint16_t value) case 0x28: /* LCD Panel Configuration */ s->lcd_config =3D value & 0xff; if (value & (1 << 7)) - fprintf(stderr, "%s: data swap not supported!\n", __func__); + error_report("%s: data swap not supported!", __func__); break; =20 case 0x2a: /* LCD Horizontal Display Width */ @@ -585,7 +585,7 @@ static void blizzard_reg_write(void *opaque, uint8_t re= g, uint16_t value) case 0x40: /* High-speed Serial Interface Tx Configuration Port 1 */ s->hssi_config[1] =3D value; if (((value >> 4) & 3) =3D=3D 3) - fprintf(stderr, "%s: Illegal active-data-links value\n", + error_report("%s: Illegal active-data-links value", __func__); break; case 0x42: /* High-speed Serial Interface Tx Mode */ @@ -641,7 +641,7 @@ static void blizzard_reg_write(void *opaque, uint8_t re= g, uint16_t value) s->enable =3D value & 1; s->blank =3D (value >> 1) & 1; if (value & (1 << 4)) - fprintf(stderr, "%s: Macrovision enable attempt!\n", __func__); + error_report("%s: Macrovision enable attempt!", __func__); break; =20 case 0x6a: /* Special Effects */ @@ -717,7 +717,7 @@ static void blizzard_reg_write(void *opaque, uint8_t re= g, uint16_t value) s->iformat =3D value & 0xf; s->bpp =3D blizzard_iformat_bpp[s->iformat]; if (!s->bpp) - fprintf(stderr, "%s: Illegal or unsupported input format %x\n", + error_report("%s: Illegal or unsupported input format %x", __func__, s->iformat); break; case 0x8e: /* Data Source Select */ @@ -729,7 +729,7 @@ static void blizzard_reg_write(void *opaque, uint8_t re= g, uint16_t value) s->iy[1] !=3D s->oy[1])) || !((s->ix[1] - s->ix[0]) & (s->iy[1] - s->iy[0]) & (s->ox[1] - s->ox[0]) & (s->oy[1] - s->oy[0]) & = 1)) - fprintf(stderr, "%s: Illegal input/output window positions\n", + error_report("%s: Illegal input/output window positions", __func__); =20 blizzard_transfer_setup(s); @@ -783,8 +783,8 @@ static void blizzard_reg_write(void *opaque, uint8_t re= g, uint16_t value) case 0xe6: /* Power-save */ s->pm =3D value & 0x83; if (value & s->mode & 1) - fprintf(stderr, "%s: The display must be disabled before enter= ing " - "Standby Mode\n", __func__); + error_report("%s: The display must be disabled before entering= " + "Standby Mode", __func__); break; case 0xe8: /* Non-display Period Control / Status */ s->status =3D value & 0x1b; @@ -815,7 +815,7 @@ static void blizzard_reg_write(void *opaque, uint8_t re= g, uint16_t value) break; =20 default: - fprintf(stderr, "%s: unknown register %02x\n", __func__, reg); + error_report("%s: unknown register %02x", __func__, reg); break; } } diff --git a/hw/display/omap_dss.c b/hw/display/omap_dss.c index 601f178fdd..52d6e753d3 100644 --- a/hw/display/omap_dss.c +++ b/hw/display/omap_dss.c @@ -406,10 +406,10 @@ static void omap_disc_write(void *opaque, hwaddr addr, s->lcd.enable =3D (value >> 0) & 1; if (value & (1 << 12)) /* OVERLAY_OPTIMIZATION */ if (!((s->dispc.l[1].attr | s->dispc.l[2].attr) & 1)) { - fprintf(stderr, "%s: Overlay Optimization when no overlay " - "region effectively exists leads to " - "unpredictable behaviour!\n", __func__); - } + error_report("%s: Overlay Optimization when no overlay " + "region effectively exists leads to " + "unpredictable behaviour!", __func__); + } if (value & (1 << 6)) { /* GODIGITAL */ /* XXX: Shadowed fields are: * s->dispc.config @@ -525,8 +525,8 @@ static void omap_disc_write(void *opaque, hwaddr addr, case 0x0a0: /* DISPC_GFX_ATTRIBUTES */ s->dispc.l[0].attr =3D value & 0x7ff; if (value & (3 << 9)) - fprintf(stderr, "%s: Big-endian pixel format not supported\n", - __func__); + error_report("%s: Big-endian pixel format not supported", + __func__); s->dispc.l[0].enable =3D value & 1; s->dispc.l[0].bpp =3D (value >> 1) & 0xf; s->dispc.invalidate =3D 1; @@ -617,7 +617,7 @@ static void omap_rfbi_transfer_start(struct omap_dss_s = *s) if (s->rfbi.control & (1 << 1)) { /* BYPASS */ /* TODO: in non-Bypass mode we probably need to just assert the * DRQ and wait for DMA to write the pixels. */ - fprintf(stderr, "%s: Bypass mode unimplemented\n", __func__); + error_report("%s: Bypass mode unimplemented", __func__); return; } =20 diff --git a/hw/display/pl110.c b/hw/display/pl110.c index 8c7dcc6f0a..b8b7903d36 100644 --- a/hw/display/pl110.c +++ b/hw/display/pl110.c @@ -174,7 +174,7 @@ static void pl110_update_display(void *opaque) dest_width =3D 4; break; default: - fprintf(stderr, "pl110: Bad color depth\n"); + error_report("pl110: Bad color depth"); exit(1); } if (s->cr & PL110_CR_BGR) diff --git a/hw/display/pxa2xx_lcd.c b/hw/display/pxa2xx_lcd.c index b83f80753a..ae3a365849 100644 --- a/hw/display/pxa2xx_lcd.c +++ b/hw/display/pxa2xx_lcd.c @@ -1050,7 +1050,7 @@ PXA2xxLCDState *pxa2xx_lcdc_init(MemoryRegion *sysmem, s->dest_width =3D 4; break; default: - fprintf(stderr, "%s: Bad color depth\n", __func__); + error_report("%s: Bad color depth", __func__); exit(1); } =20 diff --git a/hw/display/qxl-render.c b/hw/display/qxl-render.c index e7ac4f8789..0cd07028a4 100644 --- a/hw/display/qxl-render.c +++ b/hw/display/qxl-render.c @@ -78,7 +78,7 @@ void qxl_render_resize(PCIQXLDevice *qxl) qxl->guest_primary.bits_pp =3D 32; break; default: - fprintf(stderr, "%s: unhandled format: %x\n", __func__, + error_report("%s: unhandled format: %x", __func__, qxl->guest_primary.surface.format); qxl->guest_primary.bytes_pp =3D 4; qxl->guest_primary.bits_pp =3D 32; @@ -247,7 +247,7 @@ static QEMUCursor *qxl_cursor(PCIQXLDevice *qxl, QXLCur= sor *cursor, } break; default: - fprintf(stderr, "%s: not implemented: type %d\n", + error_report("%s: not implemented: type %d", __func__, cursor->header.type); goto fail; } @@ -275,9 +275,8 @@ int qxl_render_cursor(PCIQXLDevice *qxl, QXLCommandExt = *ext) } =20 if (qxl->debug > 1 && cmd->type !=3D QXL_CURSOR_MOVE) { - fprintf(stderr, "%s", __func__); + error_report("%s", __func__); qxl_log_cmd_cursor(qxl, cmd, ext->group_id); - fprintf(stderr, "\n"); } switch (cmd->type) { case QXL_CURSOR_SET: diff --git a/hw/display/qxl.c b/hw/display/qxl.c index d92fe05f1a..1d67c48109 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -875,7 +875,7 @@ static void interface_notify_update(QXLInstance *sin, u= int32_t update_id) * Probably was at some earlier version that is prior to git start (20= 09), * and is still guest trigerrable. */ - fprintf(stderr, "%s: deprecated\n", __func__); + error_report("%s: deprecated", __func__); } =20 /* called from spice server thread context only */ @@ -905,7 +905,7 @@ static void interface_async_complete_io(PCIQXLDevice *q= xl, QXLCookie *cookie) =20 trace_qxl_interface_async_complete_io(qxl->id, current_async, cookie); if (!cookie) { - fprintf(stderr, "qxl: %s: error, cookie is NULL\n", __func__); + error_report("qxl: %s: error, cookie is NULL", __func__); return; } if (cookie && current_async !=3D cookie->io) { @@ -930,7 +930,7 @@ static void interface_async_complete_io(PCIQXLDevice *q= xl, QXLCookie *cookie) qxl_spice_destroy_surface_wait_complete(qxl, cookie->u.surface_id); break; default: - fprintf(stderr, "qxl: %s: unexpected current_async %d\n", __func__, + error_report("qxl: %s: unexpected current_async %d", __func__, current_async); } qxl_send_events(qxl, QXL_INTERRUPT_IO_CMD); @@ -998,7 +998,7 @@ static void interface_async_complete(QXLInstance *sin, = uint64_t cookie_token) case QXL_COOKIE_TYPE_POST_LOAD_MONITORS_CONFIG: break; default: - fprintf(stderr, "qxl: %s: unexpected cookie type %d\n", + error_report("qxl: %s: unexpected cookie type %d", __func__, cookie->type); g_free(cookie); } @@ -1875,7 +1875,7 @@ static void qxl_send_events(PCIQXLDevice *d, uint32_t= events) trace_qxl_send_events(d->id, events); if (!qemu_spice_display_is_running(&d->ssd)) { /* spice-server tracks guest running state and should not do this = */ - fprintf(stderr, "%s: spice-server bug: guest stopped, ignoring\n", + error_report("%s: spice-server bug: guest stopped, ignoring", __func__); trace_qxl_send_events_vm_stopped(d->id, events); return; diff --git a/hw/display/tc6393xb.c b/hw/display/tc6393xb.c index 79f161740a..8b708a858b 100644 --- a/hw/display/tc6393xb.c +++ b/hw/display/tc6393xb.c @@ -159,7 +159,7 @@ void tc6393xb_gpio_out_set(TC6393xbState *s, int line, qemu_irq handler) { if (line >=3D TC6393XB_GPIOS) { - fprintf(stderr, "TC6393xb: no GPIO pin %d\n", line); + error_report("TC6393xb: no GPIO pin %d", line); return; } =20 @@ -190,7 +190,7 @@ static void tc6393xb_l3v(void *opaque, int line, int le= vel) { TC6393xbState *s =3D opaque; s->blank =3D !level; - fprintf(stderr, "L3V: %d\n", level); + error_report("L3V: %d", level); } =20 static void tc6393xb_sub_irq(void *opaque, int line, int level) { @@ -257,7 +257,7 @@ static uint32_t tc6393xb_scr_readb(TC6393xbState *s, hw= addr addr) SCR_REG_B(CONFIG); SCR_REG_B(DEBUG); } - fprintf(stderr, "tc6393xb_scr: unhandled read at %08x\n", (uint32_t) a= ddr); + error_report("tc6393xb_scr: unhandled read at %08x", (uint32_t) addr); return 0; } #undef SCR_REG_B @@ -318,8 +318,8 @@ static void tc6393xb_scr_writeb(TC6393xbState *s, hwadd= r addr, uint32_t value) SCR_REG_B(CONFIG); SCR_REG_B(DEBUG); } - fprintf(stderr, "tc6393xb_scr: unhandled write at %08x: %02x\n", - (uint32_t) addr, value & 0xff); + error_report("tc6393xb_scr: unhandled write at %08x: %02x", + (uint32_t) addr, value & 0xff); } #undef SCR_REG_B #undef SCR_REG_W @@ -341,7 +341,7 @@ static uint32_t tc6393xb_nand_cfg_readb(TC6393xbState *= s, hwaddr addr) { case NAND_CFG_BASE + 3: return s->nand_phys >> (addr - NAND_CFG_BASE); } - fprintf(stderr, "tc6393xb_nand_cfg: unhandled read at %08x\n", (uint32= _t) addr); + error_report("tc6393xb_nand_cfg: unhandled read at %08x", (uint32_t) a= ddr); return 0; } static void tc6393xb_nand_cfg_writeb(TC6393xbState *s, hwaddr addr, uint32= _t value) { @@ -357,7 +357,7 @@ static void tc6393xb_nand_cfg_writeb(TC6393xbState *s, = hwaddr addr, uint32_t val s->nand_phys |=3D (value & 0xff) << ((addr - NAND_CFG_BASE) * = 8); return; } - fprintf(stderr, "tc6393xb_nand_cfg: unhandled write at %08x: %02x\n", + error_report("tc6393xb_nand_cfg: unhandled write at %08x: %02x", (uint32_t) addr, value & 0xff); } =20 @@ -377,12 +377,14 @@ static uint32_t tc6393xb_nand_readb(TC6393xbState *s,= hwaddr addr) { case NAND_IMR: return s->nand.imr; } - fprintf(stderr, "tc6393xb_nand: unhandled read at %08x\n", (uint32_t) = addr); + error_report("tc6393xb_nand: unhandled read at %08x", (uint32_t) addr); return 0; } -static void tc6393xb_nand_writeb(TC6393xbState *s, hwaddr addr, uint32_t v= alue) { -// fprintf(stderr, "tc6393xb_nand: write at %08x: %02x\n", -// (uint32_t) addr, value & 0xff); +static void tc6393xb_nand_writeb(TC6393xbState *s, hwaddr addr, uint32_t v= alue) +{ + /* error_report("tc6393xb_nand: write at %08x: %02x", + * (uint32_t) addr, value & 0xff); + */ switch (addr) { case NAND_DATA + 0: case NAND_DATA + 1: @@ -420,7 +422,7 @@ static void tc6393xb_nand_writeb(TC6393xbState *s, hwad= dr addr, uint32_t value) tc6393xb_nand_irq(s); return; } - fprintf(stderr, "tc6393xb_nand: unhandled write at %08x: %02x\n", + error_report("tc6393xb_nand: unhandled write at %08x: %02x", (uint32_t) addr, value & 0xff); } =20 @@ -522,13 +524,15 @@ static uint64_t tc6393xb_readb(void *opaque, hwaddr a= ddr, }; =20 if ((addr &~0xff) =3D=3D s->nand_phys && s->nand_enable) { -// return tc6393xb_nand_readb(s, addr & 0xff); + /* return tc6393xb_nand_readb(s, addr & 0xff); */ uint8_t d =3D tc6393xb_nand_readb(s, addr & 0xff); -// fprintf(stderr, "tc6393xb_nand: read at %08x: %02hhx\n", (uint32= _t) addr, d); + /* error_report("tc6393xb_nand: read at %08x: %02hhx", + * (uint32_t) addr, d); + */ return d; } =20 -// fprintf(stderr, "tc6393xb: unhandled read at %08x\n", (uint32_t) add= r); + /* error_report("tc6393xb: unhandled read at %08x", (uint32_t) addr); = */ return 0; } =20 @@ -548,7 +552,7 @@ static void tc6393xb_writeb(void *opaque, hwaddr addr, if ((addr &~0xff) =3D=3D s->nand_phys && s->nand_enable) tc6393xb_nand_writeb(s, addr & 0xff, value); else - fprintf(stderr, "tc6393xb: unhandled write at %08x: %02x\n", + error_report("tc6393xb: unhandled write at %08x: %02x", (uint32_t) addr, (int)value & 0xff); } =20 diff --git a/hw/display/virtio-gpu-3d.c b/hw/display/virtio-gpu-3d.c index 8c106a662d..88bc1c84a6 100644 --- a/hw/display/virtio-gpu-3d.c +++ b/hw/display/virtio-gpu-3d.c @@ -473,7 +473,7 @@ void virtio_gpu_virgl_process_cmd(VirtIOGPU *g, return; } if (cmd->error) { - fprintf(stderr, "%s: ctrl 0x%x, error 0x%x\n", __func__, + error_report("%s: ctrl 0x%x, error 0x%x", __func__, cmd->cmd_hdr.type, cmd->error); virtio_gpu_ctrl_response_nodata(g, cmd, cmd->error); return; @@ -556,7 +556,7 @@ static void virtio_gpu_print_stats(void *opaque) VirtIOGPU *g =3D opaque; =20 if (g->stats.requests) { - fprintf(stderr, "stats: vq req %4d, %3d -- 3D %4d (%5d)\n", + error_report("stats: vq req %4d, %3d -- 3D %4d (%5d)", g->stats.requests, g->stats.max_inflight, g->stats.req_3d, diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c index 4a64b41259..44d425e1f6 100644 --- a/hw/display/vmware_vga.c +++ b/hw/display/vmware_vga.c @@ -293,45 +293,45 @@ static inline bool vmsvga_verify_rect(DisplaySurface = *surface, int x, int y, int w, int h) { if (x < 0) { - fprintf(stderr, "%s: x was < 0 (%d)\n", name, x); + error_report("%s: x was < 0 (%d)", name, x); return false; } if (x > SVGA_MAX_WIDTH) { - fprintf(stderr, "%s: x was > %d (%d)\n", name, SVGA_MAX_WIDTH, x); + error_report("%s: x was > %d (%d)", name, SVGA_MAX_WIDTH, x); return false; } if (w < 0) { - fprintf(stderr, "%s: w was < 0 (%d)\n", name, w); + error_report("%s: w was < 0 (%d)", name, w); return false; } if (w > SVGA_MAX_WIDTH) { - fprintf(stderr, "%s: w was > %d (%d)\n", name, SVGA_MAX_WIDTH, w); + error_report("%s: w was > %d (%d)", name, SVGA_MAX_WIDTH, w); return false; } if (x + w > surface_width(surface)) { - fprintf(stderr, "%s: width was > %d (x: %d, w: %d)\n", + error_report("%s: width was > %d (x: %d, w: %d)", name, surface_width(surface), x, w); return false; } =20 if (y < 0) { - fprintf(stderr, "%s: y was < 0 (%d)\n", name, y); + error_report("%s: y was < 0 (%d)", name, y); return false; } if (y > SVGA_MAX_HEIGHT) { - fprintf(stderr, "%s: y was > %d (%d)\n", name, SVGA_MAX_HEIGHT, y); + error_report("%s: y was > %d (%d)", name, SVGA_MAX_HEIGHT, y); return false; } if (h < 0) { - fprintf(stderr, "%s: h was < 0 (%d)\n", name, h); + error_report("%s: h was < 0 (%d)", name, h); return false; } if (h > SVGA_MAX_HEIGHT) { - fprintf(stderr, "%s: h was > %d (%d)\n", name, SVGA_MAX_HEIGHT, h); + error_report("%s: h was > %d (%d)", name, SVGA_MAX_HEIGHT, h); return false; } if (y + h > surface_height(surface)) { - fprintf(stderr, "%s: update height > %d (y: %d, h: %d)\n", + error_report("%s: update height > %d (y: %d, h: %d)", name, surface_height(surface), y, h); return false; } @@ -529,7 +529,7 @@ static inline void vmsvga_cursor_define(struct vmsvga_s= tate_s *s, #endif break; default: - fprintf(stderr, "%s: unhandled bpp %d, using fallback cursor\n", + error_report("%s: unhandled bpp %d, using fallback cursor", __func__, c->bpp); cursor_put(qc); qc =3D cursor_builtin_left_ptr(); --=20 2.11.0