From patchwork Wed Nov 8 22:59:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 836082 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="r7tG+QIS"; 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 3yXN5M1v7sz9s4q for ; Thu, 9 Nov 2017 10:37:59 +1100 (AEDT) Received: from localhost ([::1]:34476 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZuv-0002rI-CT for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:37:57 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35187) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZNP-0001Fa-ML for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:03:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZNM-0003sW-HN for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:03:19 -0500 Received: from mail-sn1nam01on0048.outbound.protection.outlook.com ([104.47.32.48]:16414 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 1eCZNM-0003s8-8V for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:03:16 -0500 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=2MDvpXGkNYb6BdhcNWoPiBhQz/C/5yWOMQrFiXnUiHw=; b=r7tG+QIS6aS11aOOViO/3y3068jwKrBG+LE/RX3S9gtokPfqx1lxTYimZ7gsXRqsmtHqU5wqeBZQ/LPLfh34SjSUpT7UWspqCLR2+MiCyAAzCU8XlghR+bf+t1zkvvE1dP//FqsEzdl0ZLAfJ4/dK4fympr4erAWoZOFP0qCiT4= Received: from MWHPR02CA0053.namprd02.prod.outlook.com (10.164.133.42) by CY1PR02MB1335.namprd02.prod.outlook.com (10.161.170.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.197.13; Wed, 8 Nov 2017 23:03:12 +0000 Received: from BL2NAM02FT054.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::203) by MWHPR02CA0053.outlook.office365.com (2603:10b6:301:60::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.197.13 via Frontend Transport; Wed, 8 Nov 2017 23:03:12 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.100) 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.100 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.100; helo=xsj-pvapsmtpgw02; Received: from xsj-pvapsmtpgw02 (149.199.60.100) by BL2NAM02FT054.mail.protection.outlook.com (10.152.77.107) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.197.9 via Frontend Transport; Wed, 8 Nov 2017 23:03:11 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:37152 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1eCZNG-0003zm-Tc; Wed, 08 Nov 2017 15:03:10 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZNG-0003Ga-QG; Wed, 08 Nov 2017 15:03:10 -0800 Received: from xsj-pvapsmtp01 (xsj-smtp.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id vA8N311Q010597; Wed, 8 Nov 2017 15:03:01 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZN7-0003By-72; Wed, 08 Nov 2017 15:03:01 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:59:03 -0800 Message-ID: X-Mailer: git-send-email 2.14.1 In-Reply-To: References: X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-23450.000 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)(81166006)(33646002)(9786002)(36386004)(356003)(478600001)(189998001)(5660300001)(106466001)(2351001)(106002)(2906002)(305945005)(39060400002)(63266004)(2950100002)(4326008)(6916009)(77096006)(8936002)(16586007)(81156014)(48376002)(50466002)(47776003)(54906003)(36756003)(575784001)(118296001)(76176999)(316002)(5003940100001)(8676002)(50986999)(50226002)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR02MB1335; H:xsj-pvapsmtpgw02; FPR:; SPF:Pass; PTR:unknown-60-100.xilinx.com,xapps1.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02FT054; 1:MM8hmlyvMGhPjdoVyEQbv2DY/GC+8I0IGNOqrAuWyMs2oerRiEzMKYRP927S/mzG4QJSgy6kb7g6jIOaK48ckED5YJ/+Jv2hrmhpyjrpMCHMfuvyDF1HIAhu6dHH2j5t MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 43ee47f5-2a20-4cff-b4c4-08d526fce29c X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603249); SRVR:CY1PR02MB1335; X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1335; 3:eQQBhJh6G2b4wi4WaVxJKP7RvllXk/2uOrmBwkH6D0xzdfWQCr47e9hZSEoKunt/5/krUC2+GJ74kK9V/IRUvhOk00vOLxJISyXqjvwJ5EyG+On7kdHjfLU8UtfXg/vmzxHRA/zwFVyox8giO1AfI0s/9Puw8afFUIxlbCvaWbeWdEpvUAedRO7UOOhzhAUWBwnjwFhw+j9d2+vq0TwJ1QXIS+o4JgpB4JPyT1srnjzA1AVCfKgoka9KLYTPhnEC+PB37F5SUbC1zhe+iNJJlZheh54RbxI0Z+c/hqeVqt9zuzR1//hyY47VtuoZJn6vL3wTzkr8aXKF7AX6Drjqr62jy3rVyMk7k8p7pQ61GnI=; 25:Vrs7r5JfcM/YbrS8pizeAd9givM6RVJQ0e63ux+zB1f3rFYdtZCzzCiB5uuNX+CnEn4itQn8O2Qpkg0yujcw9gtlA0pxjRIQZ1vtueK4t1OePutViTT91Y0IGY1I5EgWAIZ/EIQyo8F1rZo7OAv/7bXbuvxwfVNZuVyzHIDZLvdlPWHwA46W5dih5GZ6MO6SxkqvFBDvw8vx3NgkIgDWKdOwSnq7ieoO8483W2CTI9gle0+YUmpuCJ1M+LrVongnd9W38qKiPXHlz/ZMrGkUvrCStDbasLs/R3Cshft6hHcttGyOVNjsr/Z9PCX1BvCitUH6yX/NWXUD/eWUXEIfxw== X-MS-TrafficTypeDiagnostic: CY1PR02MB1335: X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1335; 31:EvKCQTDI6JJoMiTrrdWJ7xHVTwv4EH0MnrSQm6QwXztWdi1fFOAS5pFTblWJwqe/bYDk4+yh6rdCbkJIp8JmTi5j8urpd4Nvn+J1qlroeenNZLK/NrHQxAP+R+jSol41RYce+0d6sZKpkSo1yKm2JGrHyFR+gEjCUE6QLLy56fPO01eI1uS+f4sVIvzZwVMIJ4vH76hZkJh92q6qgKHIIuiq08u5YTzkriSFKEKSy1Y=; 20:7EP/yd1yzeZ0Aap2RNX2Vx+HmC5EDqHJU0Z0jNsIL6zs71AURNRx/7XtONx5vqKcteXCRh48kfEc4FQCHcFfIbdwusGPBjHOM+0+2OEz6qEPYu9nKUPkDmmfxEsnUiYDMHGaXjJ6VJ+3pNaphUkfrWWSFEsq4ODTt9tcbEPZqvPeVJxaIwcsjrdoGyaHq8chv1BMKT8wO5RxHAr0NhXSqTkcAjbgWQz/sv7jjb4QhBRODqASeV09c7oeRFLLoEYwX+/XyIaRI7geXXJQC969+inTO7baVTawZMZXmUDb4yiiWlOiR+tCOizjqQDxJYq3EDk+LUsNRhA8NPsq95UP05rR8CHqFHliQkSvyev1lQunih9XTEGDNIy4X+/ZCZfDMxBkRCqw6aAg+i8mYlqm9K0LKCY/cvH537wP423krNYXdGtmGT+6JFhmwtn97KJZYGJetpefNLCdEczSuh7kgVxEaFP38FjxTtI4Ga/HndFRFjb2yyQD935ROIBQG2Ym 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)(10201501046)(93006095)(93004095)(3002001)(3231021)(100000703101)(100105400095)(6055026)(6041248)(20161123558100)(20161123555025)(20161123562025)(20161123564025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY1PR02MB1335; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY1PR02MB1335; X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1335; 4:+FWBBGSx496TV8WtC7qtpkdmdxmN77RxSbzf0GN4W5Tis/3lLNJgOOjkQA+LTFki6q2FFx5pebP80JJV9khZmoM25BBfuTM4QLgvvoqtVHwO7SZ2GmyEVYmQqeY2pGjCCuK7BYhFX0XqRcI1KzGsOv6HeFIvXDju+GtXtOIAvHBikU4iWym+9Ooh0m2ockzWWuLuWvg2TGvzzHFNL3xunRcbhYc8egtDCIhPZPMCOAB3necbqrZ5u875PofFdtWFI3RtXMib/w1FGHH5JSysWCxG/okJfvLVOF0qg4UamhZzTkaJKnpfZ4JS2dWZ6amgTgq7mIA8H6j5AcUhCcPPag== X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR02MB1335; 23:6sNme4PskvLcP2ju8YqA7l+i4i6dRyRf6ccs0arDs?= Z46/67WmYCMgYEjfe2T2oYyGqWInEGxdgNwiUZKXNM3P0cH/ltDFvigB9dFi+I8VIXiWFxj0Lwh2EW9neL8LwsRbe/uoQVpmCdEmpf4URwYMwj9QSbYdASbmvu6lzF1SrP2VPSN0Dv6keBA8DnHa20/Sz7PGV4QLQ+FvYt+40r16lHhmetV/ytFudTf6nJJAZmc4WkWWNtri7V87eqwZamvV0SJZndtbQWT22UVWsNCtXPpNKaABms02pQiPUeCRWuD6/8eo0rzNCTW6XrgrI5qxlAWarnn0yB/vVcVZx7NywMtElHwcwDm44Ruqrq51Q6tuiXk5Yv85jE4M2toj+oEL6pCU6EKPFe5dG1jatnEZ/EZntbW5TYWXK9DZU7LFWmk5EygnMzWj42Pc4tgJ/3w8QyotYJ8gp2CXOoXX2eNmjTlyVpdfRWI5Hl1gvkjojPn+a/jpU3Lg2dzFkkqNEmj7BN4LETI2XnJ7tQkaWlkGhfdpHwO9pJj+ydOngGq+yourkF2SnSnWtaAL0gn/C4vMqtONsIOv68nlWgaX4DT4NUmwrpdJD6WNWxtsqk72rtKMO4Qwrncp2/NAaKEvQgcDx/k2UstYg490Xz0XLjQB2vJYWrdD/ml+zQNL+ovuMR5V4u4Nr/2gD2r1fn3PvlaaRVAjV6gA2P9A70SknJC8GZDk2OYRLp81C/bTgVnrGo/jKCPDOqBbiQ0DfZ+wwa3vUDNlOj2rzdDESSC1fQ9NMiFo21otTtjtzp/mck3ft4taOsBSpSopIuMFNR08EP2SVQe455AghQxSuDgzITdluaFkuSJWOsjjDp+RS5c8Xv65Dtke9qzhBr1vQXm6ljbC6sVMddMttD1QBYglceuoEFrNHGA/RZw1FM2B4fsThmBTBKwwQp1D/1zhjckRtu75rHVoiH2SV29zYo5ghVYiGc91fEkO9Y8Ha3acT/vUGvzRAJKGvpatDvuROT7UE7VN7eVfgDtVfNwxxVkSamvNAU0mQ/d6m4rOSQ+5v0L6NJIVvBfaTrccVlta4cJ/tVdNA5QrHJjEO4BpKab7yqfRQ== X-Microsoft-Exchange-Diagnostics: 1; CY1PR02MB1335; 6:1SCW+Rc35aiWznj+EVpOuar+6mBbF8d3BNair0r4MXxiog+wszecKXIRqbKKajFgYdgzVtrZ12+I12xcHFutWl7ejve2B/WklCneWtHVI3KNhkaYmYXMFJRDen9vn3rlRMBoBOr9s/IVXdAGawRmlWaKFHZkIJg5iVQ1kylO+Ym2eMzPKt0yvCXp7bgPb+FDEts2tdHmwCwPc2sJpu6SfxYSW0vMjVG4eK+B7bLwwIEt08zhRq0Mqdsc/LXBetLbOjHhQMD7tA+/lN/OIlhCo/bnRC+Yrs+kvbd0ipwUmjPHeGk27tMuMqOZ6smJkYGdYPS04GG4B/gv4sAy1E7q05CGGDHOeDLWiWYIInydl2c=; 5:Nih0bTY8VOMgIRkWbruQLK8+hn36hZgBD8v3vmhrmss+NLuZNHoG+pMU7M2Lt/MxR1Aw/KUeXLpAfZ8buSFys4PWEnW4W+Txw2QolGRHatoKPdtNl/80R0TyqiDoLzcSW/3GWG5re+7mmX2QmMomAGTxTWEVD9LueG5PcnCr3yI=; 24:ftSb2LCCO+6/ThqcwBZtGGsGqJrcZ/pxo3wIVH9dQPNPioBWZI92T7M6l1A3diykF5I+XF96SzRYiOh3uVfrr5RnFnnroXRjkrJlfhiql6I=; 7:aheG0A2tkhGWdw148wgtQ8xXduBKtqoTTWZiQCDMJr1DK72L/z3KtZnpZp+TwngE/hW5FxkP0wjggVU1yPFOhg7MVad4LFDWgPDH/4KPDDxQ5NyfGTFS3SZnX500PZisyqqVNlYiKfV0V4NE/p3ckc2C3q+lgiVGddtETfSKXzvxR0gQMzLi01P+xJXJSverqAr+o/MgIchGZ30LFK1D24rIoppdWn1aHC4yiQYWYLeuksv7T0/fWpWQijM8g5T4 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:03:11.5359 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 43ee47f5-2a20-4cff-b4c4-08d526fce29c 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: CY1PR02MB1335 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.32.48 Subject: [Qemu-devel] [PATCH v4 44/45] 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+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}' \ {} + 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 114c29b6a0..d73df01659 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; @@ -1527,7 +1527,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 97a24a875e..59e0411d0e 100644 --- a/exec.c +++ b/exec.c @@ -1076,7 +1076,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: @@ -1689,7 +1689,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(); } @@ -1719,8 +1719,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"); } } } @@ -1756,7 +1756,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(); } @@ -2184,8 +2184,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 438321c6cc..93bfaad556 100644 --- a/tcg/optimize.c +++ b/tcg/optimize.c @@ -122,8 +122,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(); } } @@ -136,8 +136,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 c22f1c4441..ca5d841c23 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -1035,7 +1035,7 @@ static void tcg_temp_free_internal(TCGTemp *ts) #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 cb7b329876..eadad66f7d 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" @@ -948,7 +949,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 ec299099ff..985760b76b 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)) {