From patchwork Wed Nov 8 22:58:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 10049665 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 540726032D for ; Wed, 8 Nov 2017 23:20:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 446D3297F8 for ; Wed, 8 Nov 2017 23:20:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3839E29867; Wed, 8 Nov 2017 23:20:48 +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 4A1F2297F8 for ; Wed, 8 Nov 2017 23:20:47 +0000 (UTC) Received: from localhost ([::1]:34395 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZeI-0006Km-H4 for patchwork-qemu-devel@patchwork.kernel.org; Wed, 08 Nov 2017 18:20:46 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34753) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eCZMX-0000VP-Qt for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eCZMU-0003aI-NA for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:25 -0500 Received: from mail-dm3nam03on0053.outbound.protection.outlook.com ([104.47.41.53]:34400 helo=NAM03-DM3-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 1eCZMU-0003ZY-8w for qemu-devel@nongnu.org; Wed, 08 Nov 2017 18:02:22 -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=oM/VCJVSmjaKDn1MKfFSEuHeAeX+3o1Z3kcf/JY8JBo=; b=eW5utycXaN8ntLMjOI3QmX/cUUxjmKWBMbk3hZnsvWTh79eQLthCsQLFcoipMWNjHJTd3XtsBYHgdyfNwdHWAYFkHk3G/i5bgaULxGHRxk/2UgcJJPYS/DaY3n+R7fYI2jZYbKlORcDaCyrYRSMMZZwDdGivqofsauwoGeLvFMw= Received: from CY4PR02CA0014.namprd02.prod.outlook.com (10.169.188.24) by SN1PR02MB1341.namprd02.prod.outlook.com (10.162.0.147) 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:02:18 +0000 Received: from CY1NAM02FT035.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e45::205) by CY4PR02CA0014.outlook.office365.com (2603:10b6:903:18::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.178.6 via Frontend Transport; Wed, 8 Nov 2017 23:02:18 +0000 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 (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 CY1NAM02FT035.mail.protection.outlook.com (10.152.75.186) 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:02:17 +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 1eCZMP-0001Mw-9Z; Wed, 08 Nov 2017 15:02:17 -0800 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1eCZMP-00032X-4I; Wed, 08 Nov 2017 15:02:17 -0800 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 vA8N27tO010139; Wed, 8 Nov 2017 15:02:07 -0800 Received: from [172.19.2.220] (helo=xsjalistai50.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1eCZMD-0002yi-8N; Wed, 08 Nov 2017 15:02:05 -0800 From: Alistair Francis To: Date: Wed, 8 Nov 2017 14:58:07 -0800 Message-ID: <35c73e90f5667cfee146a2f69fffea10862c4f7c.1510181732.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: MIME-Version: 1.0 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.83; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(39860400002)(376002)(346002)(2980300002)(438002)(189002)(199003)(36756003)(118296001)(63266004)(9786002)(50466002)(2351001)(33646002)(2950100002)(50986999)(6916009)(47776003)(106466001)(77096006)(5660300001)(76176999)(478600001)(54906003)(189998001)(8936002)(305945005)(36386004)(81166006)(2870700001)(2906002)(106002)(316002)(23676003)(8676002)(81156014)(575784001)(39060400002)(5820100001)(356003)(50226002)(4326008)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR02MB1341; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; CY1NAM02FT035; 1:V4fWq9lBkdUuKUGHRTKzT5841i+ub9xseo/At6FAIYVr/7A3FIzFMVN7K3ZBxtBZW9ipHaL24y0veigZub/aK32/VNSoC7/5RZ30EB2IM7Ke3GrvkCCahCdSKMKcUJE6 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 00342952-82ac-4a1e-bec6-08d526fcc2c6 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:SN1PR02MB1341; X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1341; 3:rFx57wFYk6ZZNamaDL+VPcOa/EHg+pBduIpfuV0wZzXERNqQlHy9Dfx2sg2lUb/oGr9SuNI8h/eu5Ns06rBiL+G5IXQzZQ4xIjJHeoWGDPxl4c9klclW9l+H7gPYAovcMxNkfiG6KSpTUF+NDZtlAEgaiYiy9jWWYyD68l98/3QoBi2FqvGve+VVADjJiYfq0Ed82XlbLS9P6OcU7do2aa6ZcKgLMTSFCPNMDDOTeVeY+E79xq5B4ugVC4sKtjwCXVnI0DJKGpSOGUNWgKZbZYoT56L+DO239tTvBlacJ9Xy5li3NdUEqQUr9WvOGA37ISiiYp4sBIEFhl0kEyh1drLV4kybo/Ie2yjDpQUixtE=; 25:dUNRslw1v7yDJaJW6LnW5kWOl6QHpkSwJODPfcAIt7RueLNwSoVecmSLXpnOnOR5Fka97o40Vn+IALaPPNxy8SEZqKs5bBgUHfFEXt6Id3fVuZuyvBjkfd+s1efkdICD1i2bRgIvWfOzUWFDZ7rYElwP751deB44Lj027ct7fXu1hG9+qB6LqEYAfU0upNKwKHQENX1peA4Y7QcnjkeWJhhE+Tfr+DD8sh8guco6jBMX2QWbdGy6qApSKn2lM+ih0rhZiNx2573u41m5bcDXWFP6Kj51I0WumXlaLTrs4J4fBEaL45GVYuTI6W40RZ9z4hvBf6K6tLV681lXTA7mqXyGpqyS976nLOya7WuDSA8= X-MS-TrafficTypeDiagnostic: SN1PR02MB1341: X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1341; 31:MQxrZsoNsnBUS+u57S982FmFNPBJJYcve+nTTKtXr69lKwwr+c/3Xu24FwmBG0qgIjF7Y/P/LfXOLBLYQLSMjmF08YKnG2JJZy1mwA1hr3Z3npmT9tDTgXxBLzcHyb1mqmWm8mbj1q0OyFtQhhWKugZft25Ev56IXWrvmBFXXVyi8n2uYsr6KA7+Rc+GDGhyro9ttHI4Jj58VwZE5OR6E1uhVb3CHNK/yvqcJmluJ6Q=; 20:+5FL9SAEQ8luPPiAiNiDvNEQ3SQth4rguQYh4yVwMmSOmA/kOtKdDcsyKeItbasfjlff1GkKdvsnMc7zPKdwvkuWYj0PpTzPu4NzAHklAFSAwmUNYKnRlpah0neOxftaw4N1W10gDfAIsXJkXhO027iz5U3RrArkiIA/X/nXySAWN23smzR2cE5VYf+q9L6tbl7qhH3d5On9QdIrd0YuOCDFXPJvC3V9n6XSwbQ4WjOYWPs2CVyS2H6jyHSkBimhjhp3RhcEktUqxvBWnVZ3oCVyxX244V4azHjlaTed8yxMPZ/u9pQXo0W0CoJgtJLrUv0HzGAVt5qpjVGdErvQ7uDMFb+o/QlTlV6Z5cZB6gpzBDK8/LHNVgeLCVrU6t6tG7lPNXMW/oYS770xI5SKvmwx6RMAL0axzTuLhaitjju+Z46d85I1V6bR4Zw9aqO8xhS9rW2eZrKNXlsVugLCCM335kZ4bGun7nI1LPnacfuQ3bggKfFqLmfFMfPtVup5 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)(93006095)(93004095)(3002001)(100000703101)(100105400095)(10201501046)(3231021)(6055026)(6041248)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123564025)(20161123560025)(20161123555025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:SN1PR02MB1341; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:SN1PR02MB1341; X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1341; 4:3SucIxJCaMZK8KWBu72MIbAJlJEAzq/mhCqQfInZ6FcfmXFvp8mmklMCkxCTKFxjJOBquZcApxRijNhwLGAG0dGNOimSHWhdqL6el/6ecPJSV7hGWWwVUsN/tLJU1mVSItYVMNUg7f3Ujuz/zLdBaAZhMzlO22RAb5Y9yglv3Jyg5HqnINPTYgmS8+Tt4ShGmrhhAg2tdcbjehGOMbRLa6Ze2+2NnIKsEWRKv+XncxxWbI7PYmacMh59KgYmmw29BtpFNxqazPfZosoBlLC9Ud+t4vp3llm9ul0lc+GjLxoMhLpXO3/XNCsdS3XMCd4TY3UNTMmEICQC9s2dCJR9kA== X-Forefront-PRVS: 0485417665 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR02MB1341; 23:kr/hE2i4H1ugRcQIkXweyMRXz/ceHtvOjIv3eRYL8?= =?us-ascii?Q?CmvN1aSt6HpXZafpis9ePQLZWrhgm6jpkRthFVcmKBxTrP+MT8bDOXrjr2iX?= =?us-ascii?Q?x+hoHy2LxZa4hcaReX8sUNRr0gb18jTyan0T9Yy/65DLOoamEkfrWZd9Djm3?= =?us-ascii?Q?fM9wdNlB6Kft5yShBavu5Nlt3vDFKS5VicF5GqxBqUpNH/MVRxGLVRYMdu/u?= =?us-ascii?Q?ckKmG8ds+U36382sIZDdayYwpUSg/+vjSrfsw8vH70ExJ+SCsQ8VTMPnSW5h?= =?us-ascii?Q?leSe7Te0kJKlFT1DaPTb0xmYsbAZY/gQ+oXepZ6cTR/I0GxkbRRx2xG3JaSe?= =?us-ascii?Q?qtvn2MToKWW+znX1bzTYdYN5JtpyijA6k/8ooXzmTh6YvgIDyawfAC1ex/OI?= =?us-ascii?Q?h/FeQB6G85CKa2aczw8ljFbeEpwwO8msatCN8BaDti1Em+oc4H7LBefIeuwB?= =?us-ascii?Q?OVASltUTbXxqdShU/IibHQ2FV1FXVllzBHBK5RVoaFaexgAArJIfK/PeMeqc?= =?us-ascii?Q?nCvtCpUlW17Sz9Eo5vPN/OkI/NzWonbq04m7sc6OGlwV9t/DZY0xWuwkP1u9?= =?us-ascii?Q?ajttuD5/AHJn7LSpO8IAYXXsar0Lu8TmRFmu3m9iUpd/20um8ZGLeybKx+km?= =?us-ascii?Q?nbH1hK7iFoODaxZm5h9eyBCuq5QmfjMcDNApKF4ITLkAwPggipDowcdIZz39?= =?us-ascii?Q?DNctrOJo0ek+n0MPf/CuiqMpaczi+N4lDi72eZFSiDKFiVeuhGFJ7o16vp4Y?= =?us-ascii?Q?fR9lyfu1MI6gTnMyjnfhfPilV3TnhG17TJQbcQGw8pTwcN7l4xz5Wpywdg2V?= =?us-ascii?Q?LcSh/Dxl8EgLi67ivKq0ulw9eJGiJBUCbpngwbLOGpBvzntaliY48KFuWrOJ?= =?us-ascii?Q?Yca6Ivhit9UdgZz3sIJnnbOF3bqGaYkt7J0/FOR6iDHcWHOcA98LaowfQueC?= =?us-ascii?Q?z8KrPXHfpUWl3wXpZ4ZxdBWtwCT8rdKeYngBpJGeqj84DH+WY/ZMF4U4VdKH?= =?us-ascii?Q?bTdpDUdkA8Plk2wPCAXm27tOAX3ec8SSMaWf8a7S+3QQJHlQKXCC/AliKdZO?= =?us-ascii?Q?dqV9lw=3D?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR02MB1341; 6:/gqjB5zP59Nndfz6WH22r0pGlJw1ENDrb/2c1iCrVBYHa9nO85xpLVhOEeg62KzDSEKNr8RKU9/DPkVDyPMbj9KgNfbdiDkLrMABXewq/jcrOOOUELlaDQiKCGWhCKlucP0Z/XvmvujbbulyLipjtT0NJgvFgQhrmkO2T6aK7jkoQ9t+hgnjjztdM7xVB4obisvhsUY9fxirkqiquXy90xn4OhaUK3OupKMWFTqlrnAhpE7JL3bntcneBEBBGbCfLFoN21y7BKW+WULJc5Wt9EBHANE28JV5SdxR9H2VOthvR8blSC6KQvFuB2rVwb9kZ2sfWp4TVSQS8f+w1bDYkB5VX2Mia7qcIUzonL/RMvA=; 5:sGAtgLTyOTRKurCAWZRhsIheBDK0+M6c9g8ezqU81Wu+MAJ1J1QDCXDPsuHgFYP3IIxxHGWHUCr+QO+h8BuAy+4q/S7I25nuz8ik5QuxodSmRgBXol0qtt4mX7fQzO7sTu9Dmsqmu09EkaKHxfeRF5GD8GOBs4UqJpjN67osnXY=; 24:a8mUJ0qzZ4dmUvTzLZZEJ8suulx83kXgFlTDhclQ9YayXQSBfIN7MGrORIlyRljcI4GRgsxgLY+b2EoXkkMqNqYQexKhoO5ew4Td1F9RUxw=; 7:GWzR2dO7iJg5wBuilB1drCuiNWs/2ZZ6MZVkc8JKKG8bKefKhr/Y0pnu2PizCwO6dZKnmkOPCpDsDKgTSU1LBMzUr42/OyiDsEMJueZBy6H2Tvmgg4KsbyqsvtOuIJBFvpSupNIldWlfXbW7xLLFy7EB0fl9Qiw1dOeefWaKv12OsrTAU9yQ/MNJbLZM18Mz2GOu1VFHEKfuadbbm8LkDGOB+q33/T9z55iAPNAWWEM0pBbiaJxZAX4SXKA/R8J6 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2017 23:02:17.9680 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 00342952-82ac-4a1e-bec6-08d526fcc2c6 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: SN1PR02MB1341 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.41.53 Subject: [Qemu-devel] [PATCH v4 26/45] hw/net: 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: "Michael S. Tsirkin" , Jason Wang , Alexander Graf , armbru@redhat.com, alistair23@gmail.com, alistair.francis@xilinx.com 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}' \ {} + Some lines where then manually tweaked to pass checkpatch. Manually remove a trailing '.' from hw/net/pcnet.c Signed-off-by: Alistair Francis Cc: Alexander Graf Cc: Jason Wang Cc: "Michael S. Tsirkin" Reviewed-by: Philippe Mathieu-Daudé --- V3: - Drop tailing '.' V2: - Split hw patch into individual directories hw/net/fsl_etsec/etsec.c | 2 +- hw/net/pcnet.c | 2 +- hw/net/smc91c111.c | 5 +++-- hw/net/vhost_net.c | 16 ++++++++-------- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c index 9da1932970..965effa314 100644 --- a/hw/net/fsl_etsec/etsec.c +++ b/hw/net/fsl_etsec/etsec.c @@ -347,7 +347,7 @@ static ssize_t etsec_receive(NetClientState *nc, eTSEC *etsec = qemu_get_nic_opaque(nc); #if defined(HEX_DUMP) - fprintf(stderr, "%s receive size:%zd\n", nc->name, size); + error_report("%s receive size:%zd", nc->name, size); qemu_hexdump((void *)buf, stderr, "", size); #endif /* Flush is unnecessary as are already in receiving path */ diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c index 654455355f..e7c89b41a8 100644 --- a/hw/net/pcnet.c +++ b/hw/net/pcnet.c @@ -1070,7 +1070,7 @@ ssize_t pcnet_receive(NetClientState *nc, const uint8_t *buf, size_t size_) if (!s->looptest) { if (size > 4092) { #ifdef PCNET_DEBUG_RMD - fprintf(stderr, "pcnet: truncates rx packet.\n"); + error_report("pcnet: truncates rx packet"); #endif size = 4092; } diff --git a/hw/net/smc91c111.c b/hw/net/smc91c111.c index 3b16dcf5a1..ae40fd6e6e 100644 --- a/hw/net/smc91c111.c +++ b/hw/net/smc91c111.c @@ -8,6 +8,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "hw/sysbus.h" #include "net/net.h" #include "hw/devices.h" @@ -362,9 +363,9 @@ static void smc91c111_writeb(void *opaque, hwaddr offset, return; case 12: /* Control */ if (value & 1) - fprintf(stderr, "smc91c111:EEPROM store not implemented\n"); + error_report("smc91c111:EEPROM store not implemented"); if (value & 2) - fprintf(stderr, "smc91c111:EEPROM reload not implemented\n"); + error_report("smc91c111:EEPROM reload not implemented"); value &= ~3; SET_LOW(ctr, value); return; diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c index e037db63a3..37d0cce560 100644 --- a/hw/net/vhost_net.c +++ b/hw/net/vhost_net.c @@ -135,7 +135,7 @@ static int vhost_net_get_fd(NetClientState *backend) case NET_CLIENT_DRIVER_TAP: return tap_get_fd(backend); default: - fprintf(stderr, "vhost-net requires tap backend\n"); + error_report("vhost-net requires tap backend"); return -EBADFD; } } @@ -148,7 +148,7 @@ struct vhost_net *vhost_net_init(VhostNetOptions *options) uint64_t features = 0; if (!options->net_backend) { - fprintf(stderr, "vhost-net requires net backend to be setup\n"); + error_report("vhost-net requires net backend to be setup"); goto fail; } net->nc = options->net_backend; @@ -186,8 +186,8 @@ struct vhost_net *vhost_net_init(VhostNetOptions *options) net->dev.features &= ~(1ULL << VIRTIO_NET_F_MRG_RXBUF); } if (~net->dev.features & net->dev.backend_features) { - fprintf(stderr, "vhost lacks feature mask %" PRIu64 - " for backend\n", + error_report("vhost lacks feature mask %" PRIu64 + " for backend", (uint64_t)(~net->dev.features & net->dev.backend_features)); goto fail; } @@ -197,8 +197,8 @@ struct vhost_net *vhost_net_init(VhostNetOptions *options) if (net->nc->info->type == NET_CLIENT_DRIVER_VHOST_USER) { features = vhost_user_get_acked_features(net->nc); if (~net->dev.features & features) { - fprintf(stderr, "vhost lacks feature mask %" PRIu64 - " for backend\n", + error_report("vhost lacks feature mask %" PRIu64 + " for backend", (uint64_t)(~net->dev.features & features)); goto fail; } @@ -349,7 +349,7 @@ err_start: } e = k->set_guest_notifiers(qbus->parent, total_queues * 2, false); if (e < 0) { - fprintf(stderr, "vhost guest notifier cleanup failed: %d\n", e); + error_report("vhost guest notifier cleanup failed: %d", e); fflush(stderr); } err: @@ -370,7 +370,7 @@ void vhost_net_stop(VirtIODevice *dev, NetClientState *ncs, r = k->set_guest_notifiers(qbus->parent, total_queues * 2, false); if (r < 0) { - fprintf(stderr, "vhost guest notifier cleanup failed: %d\n", r); + error_report("vhost guest notifier cleanup failed: %d", r); fflush(stderr); } assert(r >= 0);