From patchwork Thu Oct 19 16:17:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 828214 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="i9Sz0Qg/"; 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 3yHvcP2kTWz9t6m for ; Fri, 20 Oct 2017 03:33:09 +1100 (AEDT) Received: from localhost ([::1]:50124 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5Dkp-0006Zq-Dp for incoming@patchwork.ozlabs.org; Thu, 19 Oct 2017 12:33:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55790) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e5DZP-0005GE-Ie for qemu-devel@nongnu.org; Thu, 19 Oct 2017 12:21:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e5DZM-0001qE-9b for qemu-devel@nongnu.org; Thu, 19 Oct 2017 12:21:19 -0400 Received: from mail-by2nam03on0060.outbound.protection.outlook.com ([104.47.42.60]:63788 helo=NAM03-BY2-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 1e5DZL-0001pM-Tb for qemu-devel@nongnu.org; Thu, 19 Oct 2017 12:21:16 -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=WrC9pDgviRkNolL1sdKOxh5dmzIkls6lvxM6yzqesB0=; b=i9Sz0Qg/lLGjD7KmUQ1eWLMyYjv7mntBgHbz/qUMNJ3ea1upYjecdKrcvR2PRhHJ8JKZi2EobQk7LUPlQW7O5eINdFHVLH8yiQgQRYCUqYjxG2fEZOHYqtFI8ewX6Pmdao6IEECgOTEn9X98txAW9GE9D11Nlh0/wW60YgQCWzM= Received: from MWHPR02CA0056.namprd02.prod.outlook.com (10.164.133.45) by DM5PR02MB3386.namprd02.prod.outlook.com (10.164.152.162) 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:21:13 +0000 Received: from SN1NAM02FT048.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::202) by MWHPR02CA0056.outlook.office365.com (2603:10b6:301:60::45) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.77.7 via Frontend Transport; Thu, 19 Oct 2017 16:21:12 +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 SN1NAM02FT048.mail.protection.outlook.com (10.152.72.202) 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:21:11 +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 1e5DZH-0008WD-7R; Thu, 19 Oct 2017 09:21:11 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1e5DZH-000357-3O; Thu, 19 Oct 2017 09:21:11 -0700 Received: from xsj-pvapsmtp01 (smtp.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id v9JGL2SI006735; Thu, 19 Oct 2017 09:21:02 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1e5DZ7-00033b-W3; Thu, 19 Oct 2017 09:21:02 -0700 From: Alistair Francis To: Date: Thu, 19 Oct 2017 09:17:08 -0700 Message-ID: <6f22ccc78ba73da75180bade20a12d37938c8d5b.1508390588.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.11.0 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-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)(376002)(39860400002)(2980300002)(438002)(199003)(189002)(47776003)(23676002)(106466001)(33646002)(575784001)(118296001)(6916009)(76176999)(5660300001)(50986999)(50466002)(8676002)(2906002)(81166006)(9786002)(478600001)(2950100002)(54906003)(81156014)(305945005)(8936002)(2351001)(77096006)(106002)(50226002)(5820100001)(36386004)(316002)(39060400002)(189998001)(63266004)(356003)(36756003)(4326008)(2870700001)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR02MB3386; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SN1NAM02FT048; 1:YIXodYp7zsSknr7/g4uVjMPegxdpFIvOd3TOhgiPrXHbEChj1W9Qov8rqzBOSr2D3AGz0RZhn1VtK3x9hStqVguHh91h+6rUIP0e+wtwjg0ctc58csVrxsGpjiTfrH7t X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: aed244ae-bc63-481a-2dc3-08d5170d69f8 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254168)(8251501002)(4534016)(4602075)(4627075)(201703031133081)(201702281549075)(2017052603199)(201703131423091); SRVR:DM5PR02MB3386; X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3386; 3:jWRHC+5kU0BVqJ14bGrBh2uUlBTdFSubOj/ZPzi7EaU/jx1d+y5Oc5rbZKHbTYenGcGAju8BURI8uRKkngY7D4CQ+cYO9y5dJe8yTXIfLNKQ4s6DBPhCW1+/4Jmo1g8zbxmSf1fxKLoQyk4wNvWR5nZQEKa7femNpVNKflOFM0ZoxAK5TuOB2X6MZQLxMWHLPn/pfgDzzObcVm8L0+QCrLQdlxoJsO5BUKUE3kQmW8wC55Z4L1RBZqiRzaSfBwNpIXDu9k5oGXZh4btD6AB8rzBgDpLVKs6mxV8RlbTRkGWj2V3Js0bnRfEuKWs8inBzoyl3rVaqY6YDIUBmHiB0YoJtDR+FWrJyTIIY3cAN98I=; 25:1vwq5Ii4asAOYig7Bw08JZ8eNAvlvkclJl1oOMCbzpvz92QVgeSU+d023oZiAUIUBQ/OKETRMLbPezV1wIewcE6eK1fYPcoTsD67Akrqkpcw9hJb9phED+VUwKYpOAYwZtEDIbmxACiXjvXhgXs8qg3sSj4J0WIkAzz/kA1y2kmHg8dnLQH9pik0nTTo8GSMw5eqplJ7UMZc+6UKWnRXFSWx6PgXB7foSl56DpwUiWvUMfNcbTGGl0t4coRZr2myy+4UrGMLNddk1m4JBIeFguIQepvZ5FCVo31CArGLu65qDy2vMlBcPJCoaTgDn7BZ7jWFDiprrd+DwudO43ehNw== X-MS-TrafficTypeDiagnostic: DM5PR02MB3386: X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3386; 31:94TiJwWpd666STT1xibiuV27crCt1K912KHrm4LdzzAHQQ4qPR7MW9l7z9k1jDQ2ckAE86T5HI462Z+hasntDOhiv+/Ij6CAoQJig07nGKGliCnaX2HYw49HHrqEjsNJU8f1B/bOgsLaqlWLLmTu7Pm2fVYz5Of1Xp9Nfb4YL5QDxgsF2RvHy4PszaWzgzjnJy2C5j7inU+h7O8kTBvHKzp1hj+HKEdiq+9vUn8qdYo=; 20:dbGysnD2/qiDPufWkhpeRhIX8kjC4fs7JtCJVifShV+OT4epb5OppNZUiCKcKJj89mveh6F+QGg5LU1E7MYOTy26u/L631SidcwclxuOBtsH4pGRLJHu2iqDS8s6D7yqy7dnY3qJtAQ44yLfLChdnfl2+KbMg5jPa3aNuDt3Rbql3WqeMwYw0i+098mHLsRUUDY6yLfiAvj8AZg7Pbl6b+ri8kg8BFxlxBvqOknRVBM2OLSIn7CgAT7CdK7+Fr6gYBMNbTFjqfesW4KOhx9DZGrQKZj76qHVl0fo8jmK3gdDHI2ZC7cKwTPNVTAv36EsM+RQwiWPpaThxHoCLDGsCnVn+jdMyunrRZl90kUkhzImEFBKmvW1zTs7U64n/fko9d4AAG2+CTIIIfksY32XGlVwmABlMgLCe8QUSuZGWicIvKBe3FfnQ6BvbK6ySjyxjyrnxYilPKphXE/MBJknDPF1EjxZ/UXyFQJS10lU8pQYKehYVDP6eIfzz+AwcYR1 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)(3002001)(93006095)(93004095)(100000703101)(100105400095)(10201501046)(6055026)(6041248)(20161123560025)(20161123564025)(20161123562025)(20161123558100)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:DM5PR02MB3386; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:DM5PR02MB3386; X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3386; 4:HDZZiUwAMGshLtClVkVWuYJlgRKSvUSgFDadCzP0HLVnUhqbOuz4XI38W6JsaTmayAuSfk2V/u8J6cLMFj7mxBIgHQF6MljjSTTMQFpU60rpl/iZiy9Gxl5t99j/vshh5L4uRhm4Z0NiHoibl8+NyZp9+2wAv2H1oBNBFek9nuZk7PdQabvI/XIZQjTtZWcWXXljN7SFN8I8IHQj0+6GWY8o5XRgk0fxuJI8nhVLI1xA4nUc6LdJ+OivEVT5cIw5TtlTK+G3fAvSE9j+NAylePkuQoLZVlwk//viTumLeLO6NnSQb9Q6a7X/om0d2i/Zir0aZV6D1H4HqhxyQK8X4w== X-Forefront-PRVS: 0465429B7F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR02MB3386; 23:ObGNa6k90rTsucyecxhFsjxko5qnjlpIEHiJ+aYbI?= t7ZvtjgWeTKwuGDtT+BuUBVTjDlyMBN+WJo2LSX6Fx62UTGP/u31hUuRIpUo2p1AjW29/lCZKqGyO0QpaOZ1U4WecINw+NaoA3qQhxACqyVQXoKSXsteeoe1bbSu+jAwpPndDkXRezXA+uokRbMwRIoZ+8O9E5J7gGHepcHJNKF6GZqZ4EWk7xXJ6gfDsZSQd5K45gKyBg+RNDmpq2k53IUsu61fWke7bt3a+jsKdObifh3sVPlFn7qzs6dfaVSgIag3KgdmjW8vHfuPJWFu3Mfv0aylxW/RK7x/ti0DUKqyk6TV/TIZdqX5HqNNL+qnLuPEGpetARvEc9nbnsFmK5BAUpTjefYrMvLpi9lHN8LCBNWocEDCB6LHWsBBYO6bjCPyqNwVQtATWIlpWdmZxaWyjeMJ0YDVrlgHkrGeca0PQJHvUFYsm4jeFyi7R0RisaIQ8F5zHUAJpNXmOAEZGWVFa7g9LwFKCotpnHN09JZfcLqVYa38ExQr0Q2pJ7i+BbNeDeJE2kGzjdLsYipKn7iPnqM1K6TUjiEdxKb0SGLt+ipzdFtLx1f1Ah5x76j0SbCzt1wUYTdPSoiXU91q8EICl8q1Cj6oBNVjMKXuPRqz9U+6xlfrw8qQmpWSVTb1I2W6r/mRJCkyMU5R/V7IdMGoeFQS3hZHIQc19xNCKxQCho/MwvFupq6h1bplA7qXHvBty5t/YsDXuObXH9ux2cEal5v0yd8INq8NoGJV1+s0wDIlhKP779AX3y+maGOBgbQpV0v/gLtbMBBi6bbjJ1Cw8aJYMsru0hzS4M73jdSPXx/E1FrfCxoF6KULXEkGqbig783HOmatxr7d3wIv3lcPOJgbqsEfsNvRU9tuNIZb6VrY6KD4R6OvsO09v24JOLvAdFw6GEdh36JCVSESyxT6owhZLxSgDju7yz4c1ObLKsIKm4dgnVCBZu4kCf4Y/HOCwGQlNv5rViic0GT1ksRXD3YMo4BT2bpW9vFghQQnq2ItCN+PEJDyTn1sdWRG+o= X-Microsoft-Exchange-Diagnostics: 1; DM5PR02MB3386; 6:IP9qjTF/RwYd61Cbh6EcAHmEOBbhcx+UrreftU4UBIswmeEjssXzH3XNXGZ2UQFg/UtjADDwOImPkFNV6O5qPZx1sCXWqJYn6R1xIIH7fGoRRTADf4psWsK+X1Kh4Uy1hhdOf2K5IAsd6bpcA8sNKyFUJTxUQqXsic4H2Fb519XdN1fOiszitsjbHgziw91p8BBkoltUyc5S50xxEQVcW9F5ZUY9LFwa1NIaqREbPur2DYJR9glXSq67tPbxkjkyHiD6XxCPf3OEAHkaOceltlTmk70S/9EP0IQnAeN3opBQpCafOlgTAETOUo6MtA34A127UXPK3DJrwn2GoDAqSA==; 5:9QXRDKlpx0wHBI7ngIm6UhzbPu6f5Z94GWTG6wG617SQcUtNYN1Np2d/oiQlgvmK9TbCzaqYXGLyv6ki5+mcL1I/GYjxE1ucUUVqvpPmSi1ePxrZ4ZFaY53ryqaZqIJ0yJFlEwZnDO9lTa93Y7LRTw==; 24:5T4e0nj4tMoAP4OTfO7tmmtnqBFu1NoU2+lNjvG0QlnEq6Jspneg+Yk2t2bL6pRtKSaihmjXJaDZXxulKqY/+wEF4ORhdl+j2QpeYZQ64cY=; 7:GUvn59L90tv8ZGpEzfkhd5gt+oSVQPP+8Kcr6Ys39d10z61Z9b0RkiaaZxUKOJVZZnuh6wbo4fbceGSl0k3WMzgUA/bkMmLdGP5pprckcQVkw9lZpHq6ewYXBiQz3peQuvKyz2SvIAhnK2d4AlxogBOf0z6P9R6CEoU4Yo2ME+pTJhRMvr9/OJyOxUoBx7L4XPIrEFBZRQmhrP9Kbgyb3L7LZzqfiUDcs4bR21WTpug= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2017 16:21:11.9710 (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: DM5PR02MB3386 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.42.60 Subject: [Qemu-devel] [PATCH v3 26/46] 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+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 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);