From patchwork Wed Nov 8 22:58:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 836065 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="OZnJ0CyY"; 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 3yXMkz2v1Wz9s4q for ; Thu, 9 Nov 2017 10:22:03 +1100 (AEDT) Received: from localhost ([::1]:34407 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZfV-0007jU-Ab for incoming@patchwork.ozlabs.org; Wed, 08 Nov 2017 18:22:01 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35115) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZND-00013O-LR for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:03:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZNA-0003py-Bh for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:03:07 -0500 Received: from mail-bl2nam02on0065.outbound.protection.outlook.com ([104.47.38.65]:45792 helo=NAM02-BL2-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 1eCZNA-0003pk-72 for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:03:04 -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=XG89A04baYadCZPzb6KzD4sRJq7ptynF+V/3ZcqfkPg=; b=OZnJ0CyYvRCutBIYRafqbbgmh5oxy5CSMwavw1RiLh4oFfGWHrVGbN5LYmO5YkGtq0E/aoUTCCRiAMyVvkz3CAznctnoiDbW08InXqPn0zICtwbI4k09Sm5WE5KLuKFPowS8/qyyUAx/IN49MFHVKPvCSJWteh56Wx/BSdcYVmc= Received: from MWHPR02CA0013.namprd02.prod.outlook.com (10.168.209.151) by BN6PR02MB3379.namprd02.prod.outlook.com (10.161.153.10) 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:02 +0000 Received: from BL2NAM02FT035.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::207) by MWHPR02CA0013.outlook.office365.com (2603:10b6:300:4b::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.218.12 via Frontend Transport; Wed, 8 Nov 2017 23:03:01 +0000 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 (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 BL2NAM02FT035.mail.protection.outlook.com (10.152.77.157) 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:01 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:36693 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1eCZN6-0003zU-5F; Wed, 08 Nov 2017 15:03:00 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZN6-0003BM-1x; Wed, 08 Nov 2017 15:03:00 -0800 Received: from xsj-pvapsmtp01 (xsj-pvapsmtp01.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id vA8N2n0b010495; Wed, 8 Nov 2017 15:02:49 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZMu-00039O-SX; Wed, 08 Nov 2017 15:02:48 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:58:50 -0800 Message-ID: <10f1bca388976b18119fd4fc28d6fdcf7106f7d3.1510181732.git.alistair.francis@xilinx.com> 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)(50226002)(8936002)(48376002)(118296001)(106002)(63266004)(33646002)(50466002)(36386004)(4326008)(2906002)(2950100002)(5660300001)(50986999)(2351001)(6916009)(76176999)(16586007)(54906003)(47776003)(5003940100001)(316002)(106466001)(9786002)(6666003)(81166006)(81156014)(189998001)(39060400002)(356003)(575784001)(305945005)(478600001)(8676002)(77096006)(36756003)(21314002)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR02MB3379; 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; BL2NAM02FT035; 1:7Hw0j7VyVnCXFs2cgUQx+5F1bG0KHKlJEjXNojaUo/GBukXYKGV//yKoM3iUDqjmmPl2JJV/75XfKoA53awBr7UaGA61osaz1t7r36yKIA7HBgK/rrkX5Nr/qix8794d MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1aee837e-8dca-4740-cd9e-08d526fcdc65 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603249); SRVR:BN6PR02MB3379; X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3379; 3:7D9hlZKO/jkMy+LpQPEYfy0PBfLFhIMCGuF2+iH/jm5zgnT/Z9yYYaz5C7hBl67nkl7jAN/AiMGyhNKBc4hNItpcciTcUyKz02abu6jApjELe6Siav3PlOPX0gMRhb/aFV4EbcW+aWDBD0YFC2fBKMQJS2W92ZBDKc7wnLeNg7p6AwhN29oYIjcgHpGZ8jFym64kzoLR2Rv1rO2Z5sTIBS1BoslSBMZ+bT7EVp8pRUShLK5aFDJt8maXzP7fEtusaJwYnCTup8LekQvWcLof/S8rjDVMQsPNU3WQJvb52vINTEBmF4hjvL09+rtrai/SPHWSAUrqFWXHPaCG1bg9hvNhy1Ccd62RtowEApbvZro=; 25:OrmZdE6VpSojy3Ba0B5PwT4qbhAeSzkTxP8AIx9kpzXue9QF0hfKXCslf+/O9OTA2xEQlHh+5Hng7YssS2XdKAvTYyc5D0OCCQH8/ZAPYM8g9g7OgAGkypu7aNosCkO1YgeD9IXfNgrvQy+HQFn7g4zglfiYiDfgZjgmL7OgahQpzC/5i5pL3VwcnGGiKbY6+0xQpHslvXIRQ6D5C0te1qk4jv0fha/7edqDK5S4Z4BwqUJSCPqpqQPOrPz1blMn73EhoGFHcUgYrvGh5ynLN5DNx0Yulr2LJKrp5QoVWFnPoH+Mf1iTOsdRRGU/VBud+9W4rRamZJCV9ee5ph4qkA== X-MS-TrafficTypeDiagnostic: BN6PR02MB3379: X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3379; 31:ji1vZIeyeE3Nr/2GPgRWZbAuJGtq6sNTDd59/B/S2H7pdchOY9vaQ9bk7+Nbjmr/glGLOPxtKY7+rujFP2Y3oMRCJxq8e0Zn7BFH0B/sLI05lmJ3WZXPh7q3Cw7kYtQVF+ZeqjG1C8WVt1AA1dMgq3l6BO7ryNZn4L0jT6snTLfRWDTGXkdM4aBmMMiOYHC3MY/o+1A4V/0bJXEPH8wz40j7lXncL47FDIgupS24jt0=; 20:DjVOAv2qVcKTglx4hZECLvHFjARGEiII1jdVhR4tuSO6oFrwRweXF0KYQN1MQW+wFv9kAv50QQ8Ep+UZQXn1JclT+/cY8l71Mk0YKuEHj4kGXQxqQ67zySzOnuIsWx5KIz0TB0fyBU9t6OaOz2RRf/ZnvwCwl/knE15zksVVcBUgpWPKl2NLB9OwF4pk+6rIUu9b+kJNJA4QEEzZrjbn7op9wyY6eA5JhA+ppkymkz9otVoe+Ra5Ujl+kezhkoriZieAFX12N/TZ+rCvZR2PsxeL4rkshAvlSwv+hoM016rW1rs6SvxjX3rtL0FOhsSiofo4iD9Zzde4uRMNAmZvYZTH/TytZlRzP/Zgolrydq/c6myZLtfXwNmtaQWIYRNgXmRKV6ucKBRXG+JxFBH6n9bQKJPHU2fwpA/EY2LraevtG3bs3+qLhNq/9H/RGLOscl1491YnE7CWF8WT6LF1jjpzY4oCVUq46fp42kkSTqs/Skj6x5wt8AVHTn5zeXjO 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)(100000703101)(100105400095)(3231021)(10201501046)(3002001)(93006095)(93004095)(6055026)(6041248)(20161123564025)(20161123555025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123560025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BN6PR02MB3379; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BN6PR02MB3379; X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3379; 4:v6IUjaQsxXcLwUcXzODp9EOF4s+xgWo6luDHQv7+IJ/WpGSiFWvGVctOaKlZ4gzz4H4cqKwx8vuoG3l2abIiFrVMYayxrK2FrvJ63eXUg60ZeoQLkBu3xwip9WHbUuFKvcych2pLGadvmQkXtndUxMgKmF6qs83NUwAovx3wvJ4B0gTSVXEgOVyLujnCp7ySeR9VWqAUAwxClsQRwG3HSrBk750wObyGHy8mm/2l6aYmpPYGru/kzzq9TDV5O1R9EFVYu+U6EbnRA3IuBKR+mO+u/HcQY5k85gzIigBodik8l6uPJEUGPp76ILK6ZdlgJ+DXvBlOCMQWD4TX08XrbA== X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR02MB3379; 23:XHsLURfv7iaNAv3vFYxiABdu++pO9imSRt1LaMEW/?= yyivFCvDVdA4M5NrGmDh2Vuw6ilAzyZ/IEpBmd02ijJdImH2+7e7WGEZNSmQtRzJjrqRjPzuq6ANF4zTpvXC4B7ondRdIHhtjKJS6zxHXipI0eZlpVlun4FyM3C9VJ74A51zdsbyChrp2R29DcRtyB05AJ9WVrXAJLN/v41YYFt9DpflZtXiDtvd/t+6Nq4Kw/RyGLvyO0sEDWV+osBlAmOOg2lWanvyaQ7XAG/OzLRgyxHjvnDmysDHhbYCwtmsQjeg171cQcDgX6yi25Cli8cQLNWpi4boezWUu+z07bOoofbdM77D/rr4LEyKojwdYDfHuOjt8mt99bjPVhNpFVSBdkZzVEVWcfqhqS+8U+tM297pTlX6jhsV0z+oSOs7/N/vn3zRKVz5YhkC5J7Ta+BqD/J+Rdj6Nt8smjbM4V7Tu+vId1LcpOCv5i9YTtC3c+7u2nwr1a2AZ55EPq32daqE2LysWp/sSLZSkJiohG6KIfTQIgauoGGremxAsyqiR0IvtPFC275DSHDtLf6dMO0PM5td8YeDQGhaxtmEOJg4V5O70zvxndwiA4NW3Zhi5my9N1xxExGoSLhe0NmKqsVy5ZhK2MVCSYndv8fELbctO4WhRnr58qXrzvqv/wKt6Qv/kzMzmxBHZqnh+QusMDy2hAYSwZ79geqJVihEFzL7kdPXLbuk1mnjYEkTLh6sQva8aqBKm1oGi/7+isTav0WZJiAXk1ouRsm14O48PYtWhILOH4xoZ8ML9q80dmHu7oBvhj+FXqJtgb6F8vfUJtAhY6Lx+k7vQmN0cx8vgFsVHW1G4cqr/WhDSLXpB92QNk/nOnUPuCp8hDn10UEJUISxc8KKtx/oEL5BX7YW6ieIH0k2APScCy5HUmcj87iHpvwoYketmhhpsFExGVXtvt0giVlwTeR7oNFfeyyFTPeQ4FO887/tgzooJpmejrBpUKNSEFE2iSUmoLYITllZgRNGqavaJP0sXrwB1/fPZt5hUFFjN1CD7si0YXmD7N0oMKR91aCKjNlEhiS+xAP1HdcLsHNm7YWT9SJB58jWAodgzzWYbSiHFWV7UpXh3j0YDo= X-Microsoft-Exchange-Diagnostics: 1; BN6PR02MB3379; 6:4GrJhSOyosXWzqDqEpB0xLbxEA7tibr2gpYTF8veyHEFo/+UHaI8WCR/Wl9jk/jm8Y6xMaofp2XxJHIffGFVgKkLrvi/y40ol7EanQ+wFYzB9CQGjIQZx+RD53HEwD4/GvKfPGkR79ro6qubchgrb/LM7lpnfFN9kGoJmTI+RbXiho5c6VTsggjC5uapDhSNiLPm34BXWX0sOsgtqZYZ+n1GerIHRac83FOAHmwjhryfcFn/mIYRWaiaetywciFg0h2xAkgIjQ7Iq8tZoci4dOtuCLyKC1ixPIAxUbsIbPQfTL7eMDoDaix8PjUo5vtbh3N55Xjd+vKB8xF2Kgk5VHZZACbUijww4MGEXkH++lE=; 5:s7vRFNg1LFmkaUT+XropQKlJ/3sK6091A3aM/wJaxQ/WJys/nkbv5tpPdK3RHEATmhkxsNhgig61mTr2Ftuh6S6QkHFbaRGIBcE/wsDX/Unk5xaXam3wq2ImrZ+o24HSTyyi/VPUwhmvXuXLFudRgkGrJ5Elr50kuLbWKsxtq4s=; 24:tz2rtLXrZANOOIe2gl/ALBq69Sh26ZOKX8H7I7SChh4aCepLLWEgZbA6yE62CnvIMPQKhKjk/nUq8YEJ0sMMAk8HOURL1/q62QAr/ZCow7M=; 7:3cTZNE00OkstrT9wBR3jIfBsRaiEvK4ARhIaIlhXmXzOXs2YvVYxK0QT+zkIyoFDNVTdzi0W1SbFNBAJ/vwJWK5rREUb//3d8t8wFJick1hO2YN2uZHD5VS5XsAmawaIW1MUUmTt4RcN+NmRYW0iGXJD/2X1e+UByGwmVS2GPCuSypIiCSfO2P29WGuX2pV+sA1OIyCWxB6xpbig2SZ0xD74xGn4m1hnWpc6GwFFqB2JWlxA0GQqKvJRqVG5foxr SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:03:01.1566 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1aee837e-8dca-4740-cd9e-08d526fcdc65 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: BN6PR02MB3379 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.38.65 Subject: [Qemu-devel] [PATCH v4 40/45] hw/watchdog: 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+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}' \ {} + Some lines were then manually tweaked to pass checkpatch. Some lines in wdt_i6300esb.c were manuallly changed to qemu_log_mask(). Signed-off-by: Alistair Francis --- V3: - Use qemu_log_mask(LOG_UNIMP,... in wdt_i6300esb.c V2: - Split hw patch into individual directories hw/watchdog/watchdog.c | 11 +++++------ hw/watchdog/wdt_i6300esb.c | 10 +++++++--- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/hw/watchdog/watchdog.c b/hw/watchdog/watchdog.c index 670114ecfe..9594457082 100644 --- a/hw/watchdog/watchdog.c +++ b/hw/watchdog/watchdog.c @@ -20,6 +20,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qemu/option.h" #include "qemu/config-file.h" #include "qemu/queue.h" @@ -52,8 +53,7 @@ int select_watchdog(const char *p) /* -watchdog ? lists available devices and exits cleanly. */ if (is_help_option(p)) { QLIST_FOREACH(model, &watchdog_list, entry) { - fprintf(stderr, "\t%s\t%s\n", - model->wdt_name, model->wdt_description); + error_report("\t%s\t%s", model->wdt_name, model->wdt_description); } return 2; } @@ -68,10 +68,9 @@ int select_watchdog(const char *p) } } - fprintf(stderr, "Unknown -watchdog device. Supported devices are:\n"); + error_report("Unknown -watchdog device. Supported devices are:"); QLIST_FOREACH(model, &watchdog_list, entry) { - fprintf(stderr, "\t%s\t%s\n", - model->wdt_name, model->wdt_description); + error_report("\t%s\t%s", model->wdt_name, model->wdt_description); } return 1; } @@ -126,7 +125,7 @@ void watchdog_perform_action(void) case WATCHDOG_ACTION_DEBUG: qapi_event_send_watchdog(WATCHDOG_ACTION_DEBUG, &error_abort); - fprintf(stderr, "watchdog: timer fired\n"); + error_report("watchdog: timer fired"); break; case WATCHDOG_ACTION_NONE: diff --git a/hw/watchdog/wdt_i6300esb.c b/hw/watchdog/wdt_i6300esb.c index e596b0804d..967f3ebc0d 100644 --- a/hw/watchdog/wdt_i6300esb.c +++ b/hw/watchdog/wdt_i6300esb.c @@ -20,7 +20,7 @@ */ #include "qemu/osdep.h" - +#include "include/qemu/log.h" #include "qemu-common.h" #include "qemu/timer.h" #include "sysemu/watchdog.h" @@ -186,10 +186,14 @@ static void i6300esb_timer_expired(void *vp) /* What to do at the end of stage 1? */ switch (d->int_type) { case INT_TYPE_IRQ: - fprintf(stderr, "i6300esb_timer_expired: I would send APIC 1 INT 10 here if I knew how (XXX)\n"); + qemu_log_mask(LOG_UNIMP, + "i6300esb: timer expired but System " + "APIC 1 INT10 not emitted\n"); break; case INT_TYPE_SMI: - fprintf(stderr, "i6300esb_timer_expired: I would send SMI here if I knew how (XXX)\n"); + qemu_log_mask(LOG_UNIMP, + "i6300esb: timer expired but System " + "Management Interrupt not emitted\n"); break; }