From patchwork Thu Oct 19 16:18:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 10017679 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id F221660224 for ; Thu, 19 Oct 2017 16:36:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E4D4226E5D for ; Thu, 19 Oct 2017 16:36:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D90A328B64; Thu, 19 Oct 2017 16:36:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D1CDB26E5D for ; Thu, 19 Oct 2017 16:36:05 +0000 (UTC) Received: from localhost ([::1]:50134 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5Dng-0008JI-Vg for patchwork-qemu-devel@patchwork.kernel.org; Thu, 19 Oct 2017 12:36:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56304) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5Dac-0006HT-UF for qemu-devel@nongnu.org; Thu, 19 Oct 2017 12:22:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e5DaZ-0002QK-MC for qemu-devel@nongnu.org; Thu, 19 Oct 2017 12:22:34 -0400 Received: from mail-bn3nam01on0069.outbound.protection.outlook.com ([104.47.33.69]:8016 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 1e5DaZ-0002PZ-Fg for qemu-devel@nongnu.org; Thu, 19 Oct 2017 12:22:31 -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=8WTy4Bp7MB1phlcW2JO2XuAmQx4JK3cD1W6YMgrjPzY=; b=hc4mpubo0vHk1sjWw11fYFcvV4Sy/PaSGFm54NhbgCLZRVUO8/qa8jZUvZ7qXw+ZzHTpydfjum/fKFIwxD3LNTuSwfFirO5gwFXCoZb2g7TabxYdbW5az5umDL9uhhuIf4ky5Cv0VKPy9kGxZrHUF9HEEqoZUceI4oIZSv0wuUU= Received: from SN4PR0201CA0053.namprd02.prod.outlook.com (10.171.31.143) by DM5PR02MB3385.namprd02.prod.outlook.com (10.164.152.161) 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:22:27 +0000 Received: from CY1NAM02FT057.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::204) by SN4PR0201CA0053.outlook.office365.com (2603:10b6:803:20::15) 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:22:27 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.83) smtp.mailfrom=xilinx.com; weilnetz.de; dkim=none (message not signed) header.d=none;weilnetz.de; 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 CY1NAM02FT057.mail.protection.outlook.com (10.152.75.110) 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:22:26 +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 1e5DaT-00006v-Us; Thu, 19 Oct 2017 09:22:25 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1e5DaT-0003Nz-Rw; Thu, 19 Oct 2017 09:22:25 -0700 Received: from xsj-pvapsmtp01 (mailman.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id v9JGMGr9007121; Thu, 19 Oct 2017 09:22:17 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1e5DaK-0003Me-O5; Thu, 19 Oct 2017 09:22:16 -0700 From: Alistair Francis To: Date: Thu, 19 Oct 2017 09:18:24 -0700 Message-ID: <32ea025cd38b461217986a00fa3c8e20e0440385.1508390588.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-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)(39860400002)(376002)(2980300002)(438002)(189002)(199003)(8936002)(33646002)(106466001)(36756003)(5003940100001)(36386004)(5660300001)(189998001)(4326008)(118296001)(81166006)(47776003)(8676002)(81156014)(63266004)(16586007)(9786002)(2351001)(356003)(106002)(316002)(6916009)(77096006)(50226002)(50986999)(2950100002)(48376002)(76176999)(54906003)(2906002)(478600001)(6666003)(305945005)(39060400002)(50466002)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR02MB3385; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1NAM02FT057; 1:tkkIWYpE7P5TvMxTsOJ8QscXqWHA/jsPw4Ato6BsAVdZWviBgukydkbOXzH4a4ZQVRPwnMgJwyH6TdySJal9rDN50XQc1eio9RPc4Tg6APLQq+BY5Heq+l+lnaLa3Wdx MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0504b207-809c-4877-b557-08d5170d966d X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(8251501002)(2017052603199)(201703131423075)(201703031133081)(201702281549075); SRVR:DM5PR02MB3385; X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3385; 3:MeMkPqcINSXJOggy9umXHUDelXUdsC084oS88CMGoH6nhAk846czmGdaMQm7ta8AT0ESMyjcDCPNm6bD+Jb6SMQ9ECexkR5JfLqeBeWT0JkQk9W/X4NVROHvclgKbGvKHMQraHu+dyMm8L5l7VnL0mWmRpWOP2uO4VAXJ85J+igwxM/fXA0H0CqCXkhQpYoQn6/ex69Rl9x+/QxQ1hvAqC6R1BScCyl1iqf4BmFBCMjm/SdKPsKjHE7nLeDOneifYpapvJAoxgzyhEIeNTdM7/F4LA/1638WhelvgyqGECOBzbm2j6y8KYtNkAovD90D954uCy7L4fATqmW41nWVemKNjqyYCO9A+emh1F37F9k=; 25:yqYKF0J78Yf7IRGmOVl3Neu/FJ8Yr4MuZZU+fsttJhv/dM/sSb8oYgJ9OxXod9uu7we7E14A5LM2sMNQwEdUavpt1BMlW4ZAswoH9kP1cPtqwI1RgUsayHyY3YhjKARxnmpqacxtT0vJNY189klua8UjKme+lCgCdJWUs3satczV3HysPRQpQzrZeuBlAp4nt9YxQOiDaQp7SodZroM6T032eviPpPT/0R5LDrGYwc0P4tGDVLx5WwB7+5WrGOXDElwvU+0VhoB8675nARdbP7cO/QZFwr0H4igaF/9EbBMqstd4r8zsWp3gmTqvK4z0LKVdQcs2S5StOgxWysW47A== X-MS-TrafficTypeDiagnostic: DM5PR02MB3385: X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3385; 31:n3PmShff3y5U1eeAOPo4JBNATwTpIIoKM+z+SDTByrtJRmHbDFRKU+ObcWdmiSxMnmU+HMChHF+lI7DQjgsC5Ds65DURaku3PGS8Wv+cWbOwQ2sTZyt896BHWxm5MqeIFJACj4ldvghqSg6/8oL34sD0Rob4fKiJ036K2OeaYmNDENVnZk9iwx4X0uWlnEG+bxvw/6tKNVp4WNDbmI13RHSkyVSqHv8SC+PYIorYLmc=; 20:XU3dokaPWXLaXelaWALP99lh8pZScNsuwu+8OdE25zyKI4oih8sRi+ir2WVl//w4vYVFCLySfcQ5uIasaTeJMR+PV+Z0LRo0yHzdxDIYLgVzpi4kQbTxNOGz1IECAyL1X29esaiiIPxa1XNw9J7cqqEJTW+Ae5Qvf5QYPs6WJMUbUFA5VoBMNNqkndacz/NV9p8YdcA4Dt9CGdk6a+oAOKCg3T5BmV5KUlTWggUdj8PqqKWrpbcege3DdNOGiCaq0UyLS8LtcsJzSYlLWhTsYQQBLSzefhQWD0twv4ainkkakbHbzJR0Pvoq1jDWwEmhpnqS0QaDyLl/RpjEe6hTH5l4nUUaX0dSK/S9REvB5sOvRNbfUlHOpAvXP7iNxlAaOZW1+z+l02W2ImVbDWyFCf095ZRogRWecwoHkaa+vGovXXbYNS2TgEiIkx5tzoTDF+kvpICKFlkV16+oNasMe2Gkt+3a//pSmxERmGAhs3llQxuW/om84L3xA8myXIDQ 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)(8121501046)(5005006)(3002001)(93006095)(93004095)(100000703101)(100105400095)(10201501046)(6055026)(6041248)(20161123558100)(20161123555025)(20161123560025)(20161123564025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:DM5PR02MB3385; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:DM5PR02MB3385; X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3385; 4:VV+L+/Gl7s9hO2jWR016gs/jZ03DEs1mEgZOO3TJC+ArQZ5miF8pfRqZ7hSdta1UoVmlDeQ+5Q4yQmD9qrnzYpss8Fy2lu3W5IlfhixFb6KP26NVT3ShMTwy/2jgycrEFCM/CzG3POrV68yIWWXhDi5sEIaDnWNa0ahtUxMSx6cwpcUBiNLBkFREvLMcEjzpcyY38EskAR4kLEhwwps3L3tqny1JB9pfAliBEucCOLdV1IokAp827isTfYSKCMrjuUGAqpl4xaZyIdZ4Ar2oQ7ZaHuHNixk6k5HnHeX1M52AGcumQOTunAogkTZQK8UpcbzRJb4cmuzHzxjpaQgYWw== X-Forefront-PRVS: 0465429B7F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR02MB3385; 23:zenuHqcW0tl4rYtTviNynjMjGK9toGenBQFFHTrpQ?= =?us-ascii?Q?V6yeZafNblPK0qQ6qs3Vx1E0+/YlKn85P9m308H0fLUpVlrEFv2gnO8dpbjr?= =?us-ascii?Q?HWTzZGgSX8ZRGO/ZKjUZpH8fVpjXrmuhXoqZRVpPlHflG7cWvR6bRLNH2at4?= =?us-ascii?Q?RItVQoxCgW9svQhRUFrPJ/efwfca41uEyh2udHckRSiqdO9/ZnsnRQ+8Zlig?= =?us-ascii?Q?rZ+ApYF7ANLUwAbZEVdvoCwcH7vLtlGbUuZ0VhPrZSXuUIyBvRQPfm7+ix5d?= =?us-ascii?Q?HdkzebK2fcgkcaTP71J3J67d3PId7E/WR9c6DM+WDNS4ZAlO/p0Ew5G+Dx8Y?= =?us-ascii?Q?BNuK/+J+N37jeBu1SXIYuQjq36imW4GnobtWNwVafNiE6cpn7s/+onaP2NeV?= =?us-ascii?Q?CFtZKvM0tlksZsOqKiU9dlzw5NcZfOVpwyvd7H1jBxYcw/bgyGgV0odVlEb8?= =?us-ascii?Q?4whDiJIgMbjIFSZAfzbenENMzhYqnX5VVUdnVR5DJtm0uWf0uG4wJ0LttVVq?= =?us-ascii?Q?QDGU7PzKI82sTo+nG5Nr/tGpRsX1UfSlfdop6C3M9jRQBbsD15Y9WtOHQI9O?= =?us-ascii?Q?5FRVa5SfdvsPYkY5SYmJ2QC/gDV/VxxgEcIRuTw1uWR7LPS6KrVvQB16s+Lw?= =?us-ascii?Q?hfFcD++NSAPn6kNdRlWUPZP+3oPYnK0DxKnAAo8ntdSGFGW/H2dp4hh/EehT?= =?us-ascii?Q?e8t98wLPgN0vE01peFmJmX3Of/eW8fxz21zZEsSbpuFYgVQnphHK3Sd3tSaG?= =?us-ascii?Q?6J7HVnLUHup3a0cWdJGF7eC7rhOg19Wt83cVXAdaQZHOimm0M+Kqp9d/FTUQ?= =?us-ascii?Q?3vA4uG1tvntgwjXXyWrpIezOzJiCpJGhqdXVisM7s5EkS4PURivsFOXZq8p2?= =?us-ascii?Q?cYSH0rjS7SZOPMHUPJth/p3A3IDHcFL5ymV5SCuDGCz46wiOhJMq5ue7jUru?= =?us-ascii?Q?zItxOzdTvK1EJTInJTxt8kDRUx9nXKyXsmkw4miOmQnzgtsO9+lDBunNom8R?= =?us-ascii?Q?KGbshNujDmOEvAnLucMr0jpRXv3MrICnfCxW3Cu/TrmSw7DpazaMQZjOK5QU?= =?us-ascii?Q?OgiLDE=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3385; 6:hSRRkDoqiQo4qZ8V4Ahfb3CVVJ/XHz06CXHHrElWlmPVvELq4m5EYpHwI4AMp75AcD72wa2T2qAEaBP+F8kcHBc1vThQSBRQE1lpTWNBA+ngPNirWTjSvoN4BfQvpPjkvnOsospl7VDB0eLiIZ6KcUNnjoQniaGU0vDj3l1nHdcRbgZE/4JBRy0uwiTceUczhfvdhabc6vzLHcujzqjKPWmBpLWkQIkYHU5B6K2zzGrpKLTmVQGa3KLTi/5AYA4eypb+7xlqEtiCb7pyEbarvE8hcDwXCNsYnaq1I+4IWnWozoPnaKa3NIDZ5L3rD2En+gL8lUhohiFRn5ziCB4Dww==; 5:seQqy2RLn5he8mIrp+an4kvYjCqIBdv+mqt9f3dzKz9msm1MQ5/oYU7Y3nymIHA2r4uXxXMsU2yGt4/3CIpDele9y6jgv3CL8q3LamItqMMEjw0rahY6Hx7aNIR1OHnY0VbM6ttAASk9UIhVtpOirQ==; 24:w867mD/4SSceJdda22+0jFY/NDM3w2pOj/3rYzK8bUcpJuspTRqAgSUgCpEJ8WlNM+n4SG/WoNULscbS9jLL0UQxYLGTn94frCXVB7+m9sU=; 7:d8mPFH4ExSMGBImZ3KrRt7E70QudQsqbAcsGy9ewb4hOOKEghXTYZiaLERcqQ1izcpsLQGhP6pVCi1i4ojsiCKaX+Elz4DuH05BwV1Ha+a4CiQp9dNxFXHGW8RzrhAvDCFGEdgxZgQnCidhtj1uklElIJWnSPP+fC8+MfLkDQsn/dztjv5vwNZ4Ur5AcDksehuYjy0Ms4Ov8HmVnNJu2FcA/5ErsW3wqPxiBAH8tSwY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2017 16:22:26.3422 (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: DM5PR02MB3385 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.33.69 Subject: [Qemu-devel] [PATCH v3 44/46] tcg: 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: Peter Crosthwaite , Stefan Weil , armbru@redhat.com, alistair.francis@xilinx.com, Paolo Bonzini , alistair23@gmail.com, Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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}' \ {} + Signed-off-by: Alistair Francis Cc: Paolo Bonzini Cc: Peter Crosthwaite Cc: Richard Henderson Cc: Stefan Weil Acked-by: Richard Henderson --- cpus.c | 8 ++++---- exec.c | 14 +++++++------- tcg/optimize.c | 8 ++++---- tcg/tcg.c | 2 +- tcg/tcg.h | 3 ++- tcg/tci.c | 2 +- tcg/tci/tcg-target.inc.c | 4 ++-- vl.c | 2 +- 8 files changed, 22 insertions(+), 21 deletions(-) diff --git a/cpus.c b/cpus.c index c9a624003a..784cee4848 100644 --- a/cpus.c +++ b/cpus.c @@ -258,7 +258,7 @@ int64_t cpu_get_icount_raw(void) if (cpu && cpu->running) { if (!cpu->can_do_io) { - fprintf(stderr, "Bad icount read\n"); + error_report("Bad icount read"); exit(1); } /* Take into account what has run */ @@ -1113,7 +1113,7 @@ static void *qemu_kvm_cpu_thread_fn(void *arg) r = kvm_init_vcpu(cpu); if (r < 0) { - fprintf(stderr, "kvm_init_vcpu failed: %s\n", strerror(-r)); + error_report("kvm_init_vcpu failed: %s", strerror(-r)); exit(1); } @@ -1143,7 +1143,7 @@ static void *qemu_kvm_cpu_thread_fn(void *arg) static void *qemu_dummy_cpu_thread_fn(void *arg) { #ifdef _WIN32 - fprintf(stderr, "qtest is not supported under Windows\n"); + error_report("qtest is not supported under Windows"); exit(1); #else CPUState *cpu = arg; @@ -1525,7 +1525,7 @@ static void qemu_cpu_kick_thread(CPUState *cpu) #else /* _WIN32 */ if (!qemu_cpu_is_self(cpu)) { if (!QueueUserAPC(dummy_apc_func, cpu->hThread, 0)) { - fprintf(stderr, "%s: QueueUserAPC failed with error %lu\n", + error_report("%s: QueueUserAPC failed with error %lu", __func__, GetLastError()); exit(1); } diff --git a/exec.c b/exec.c index 6378714a2b..9626fb3566 100644 --- a/exec.c +++ b/exec.c @@ -1043,7 +1043,7 @@ static RAMBlock *qemu_get_ram_block(ram_addr_t addr) } } - fprintf(stderr, "Bad ram offset %" PRIx64 "\n", (uint64_t)addr); + error_report("Bad ram offset %" PRIx64 "", (uint64_t)addr); abort(); found: @@ -1656,7 +1656,7 @@ static ram_addr_t find_ram_offset(ram_addr_t size) } if (offset == RAM_ADDR_MAX) { - fprintf(stderr, "Failed to find gap of requested size: %" PRIu64 "\n", + error_report("Failed to find gap of requested size: %" PRIu64 "", (uint64_t)size); abort(); } @@ -1686,8 +1686,8 @@ static void qemu_ram_setup_dump(void *addr, ram_addr_t size) ret = qemu_madvise(addr, size, QEMU_MADV_DONTDUMP); if (ret) { perror("qemu_madvise"); - fprintf(stderr, "madvise doesn't support MADV_DONTDUMP, " - "but dump_guest_core=off specified\n"); + error_report("madvise doesn't support MADV_DONTDUMP, " + "but dump_guest_core=off specified"); } } } @@ -1723,7 +1723,7 @@ void qemu_ram_set_idstr(RAMBlock *new_block, const char *name, DeviceState *dev) RAMBLOCK_FOREACH(block) { if (block != new_block && !strcmp(block->idstr, new_block->idstr)) { - fprintf(stderr, "RAMBlock \"%s\" already registered, abort!\n", + error_report("RAMBlock \"%s\" already registered, abort!", new_block->idstr); abort(); } @@ -2151,8 +2151,8 @@ void qemu_ram_remap(ram_addr_t addr, ram_addr_t length) flags, -1, 0); } if (area != vaddr) { - fprintf(stderr, "Could not remap addr: " - RAM_ADDR_FMT "@" RAM_ADDR_FMT "\n", + error_report("Could not remap addr: " + RAM_ADDR_FMT "@" RAM_ADDR_FMT "", length, addr); exit(1); } diff --git a/tcg/optimize.c b/tcg/optimize.c index adfc56ce62..31b15b508d 100644 --- a/tcg/optimize.c +++ b/tcg/optimize.c @@ -96,8 +96,8 @@ static TCGOpcode op_to_mov(TCGOpcode op) case 64: return INDEX_op_mov_i64; default: - fprintf(stderr, "op_to_mov: unexpected return value of " - "function op_bits.\n"); + error_report("op_to_mov: unexpected return value of " + "function op_bits."); tcg_abort(); } } @@ -110,8 +110,8 @@ static TCGOpcode op_to_movi(TCGOpcode op) case 64: return INDEX_op_movi_i64; default: - fprintf(stderr, "op_to_movi: unexpected return value of " - "function op_bits.\n"); + error_report("op_to_movi: unexpected return value of " + "function op_bits."); tcg_abort(); } } diff --git a/tcg/tcg.c b/tcg/tcg.c index 4492e1eb3f..6654644c7e 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -675,7 +675,7 @@ static void tcg_temp_free_internal(int idx) #if defined(CONFIG_DEBUG_TCG) s->temps_in_use--; if (s->temps_in_use < 0) { - fprintf(stderr, "More temporaries freed than allocated!\n"); + error_report("More temporaries freed than allocated!"); } #endif diff --git a/tcg/tcg.h b/tcg/tcg.h index b2d42e3136..589ec4aa74 100644 --- a/tcg/tcg.h +++ b/tcg/tcg.h @@ -29,6 +29,7 @@ #include "cpu.h" #include "exec/tb-context.h" #include "qemu/bitops.h" +#include "qemu/error-report.h" #include "tcg-mo.h" #include "tcg-target.h" @@ -895,7 +896,7 @@ typedef struct TCGTargetOpDef { #define tcg_abort() \ do {\ - fprintf(stderr, "%s:%d: tcg fatal error\n", __FILE__, __LINE__);\ + error_report("%s:%d: tcg fatal error", __FILE__, __LINE__);\ abort();\ } while (0) diff --git a/tcg/tci.c b/tcg/tci.c index 63f2cd54ab..6c851d3450 100644 --- a/tcg/tci.c +++ b/tcg/tci.c @@ -35,7 +35,7 @@ /* Marker for missing code. */ #define TODO() \ do { \ - fprintf(stderr, "TODO %s:%u: %s()\n", \ + error_report("TODO %s:%u: %s()", \ __FILE__, __LINE__, __func__); \ tcg_abort(); \ } while (0) diff --git a/tcg/tci/tcg-target.inc.c b/tcg/tci/tcg-target.inc.c index 913c3802a3..2f4b56d3ba 100644 --- a/tcg/tci/tcg-target.inc.c +++ b/tcg/tci/tcg-target.inc.c @@ -29,7 +29,7 @@ /* Marker for missing code. */ #define TODO() \ do { \ - fprintf(stderr, "TODO %s:%u: %s()\n", \ + error_report("TODO %s:%u: %s()", \ __FILE__, __LINE__, __func__); \ tcg_abort(); \ } while (0) @@ -403,7 +403,7 @@ static const char *target_parse_constraint(TCGArgConstraint *ct, void tci_disas(uint8_t opc) { const TCGOpDef *def = &tcg_op_defs[opc]; - fprintf(stderr, "TCG %s %u, %u, %u\n", + error_report("TCG %s %u, %u, %u", def->name, def->nb_oargs, def->nb_iargs, def->nb_cargs); } #endif diff --git a/vl.c b/vl.c index 0723835bbf..c04a87458f 100644 --- a/vl.c +++ b/vl.c @@ -2232,7 +2232,7 @@ static DisplayType select_display(const char *p) display_opengl = 1; display = DT_EGL; #else - fprintf(stderr, "egl support is disabled\n"); + error_report("egl support is disabled"); exit(1); #endif } else if (strstart(p, "curses", &opts)) {