From patchwork Fri Sep 1 16:51:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 808831 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="ECP3i6oE"; 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 3xkQR46wxpz9t2x for ; Sat, 2 Sep 2017 02:57:51 +1000 (AEST) Received: from localhost ([::1]:50083 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dnpGP-0008Fs-BS for incoming@patchwork.ozlabs.org; Fri, 01 Sep 2017 12:57:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50990) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dnpDi-0005pP-Gu for qemu-devel@nongnu.org; Fri, 01 Sep 2017 12:55:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dnpDf-00065T-Az for qemu-devel@nongnu.org; Fri, 01 Sep 2017 12:55:02 -0400 Received: from mail-sn1nam01on0050.outbound.protection.outlook.com ([104.47.32.50]:9768 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 1dnpDf-00065C-26 for qemu-devel@nongnu.org; Fri, 01 Sep 2017 12:54:59 -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=ULf3fR2veRHyjzzXcEHwNaf8AuktwVuJrkSrYN1XS+g=; b=ECP3i6oEU3zLxNF7SgZBJSLnPpJ7Bh/1wBqwFGimn1J7EYYkjdzEGuIQrNi33BT9167G1OZqOS/GWRKfbLARThlOTGyVvsmagSZF9m6vUORh5xKBm5+Wzf1rAxXezHRjN9DMrbs/0vK12pI5j4YBN0PcWY1v+FGaLxyGGU/5qUQ= Received: from BY2PR02CA0008.namprd02.prod.outlook.com (10.163.44.146) by BN3PR02MB1128.namprd02.prod.outlook.com (10.162.168.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.13.10; Fri, 1 Sep 2017 16:54:55 +0000 Received: from SN1NAM02FT019.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::206) by BY2PR02CA0008.outlook.office365.com (2a01:111:e400:5261::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.13.10 via Frontend Transport; Fri, 1 Sep 2017 16:54:54 +0000 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 SN1NAM02FT019.mail.protection.outlook.com (10.152.72.130) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1385.11 via Frontend Transport; Fri, 1 Sep 2017 16:54:53 +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 1dnpDZ-0002aM-7N; Fri, 01 Sep 2017 09:54:53 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1dnpDZ-0003eO-4D; Fri, 01 Sep 2017 09:54:53 -0700 Received: from xsj-pvapsmtp01 (smtp2.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id v81GspmY028968; Fri, 1 Sep 2017 09:54:51 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1dnpDX-0003dX-C8; Fri, 01 Sep 2017 09:54:51 -0700 From: Alistair Francis To: Date: Fri, 1 Sep 2017 09:51:15 -0700 Message-ID: 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-23296.003 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)(2980300002)(438002)(199003)(189002)(106466001)(4326008)(626005)(2351001)(33646002)(8936002)(39060400002)(118296001)(47776003)(50226002)(6916009)(50986999)(356003)(76176999)(2950100002)(36386004)(63266004)(77096006)(54906002)(81166006)(9786002)(8676002)(2906002)(110136004)(5003940100001)(81156014)(36756003)(478600001)(48376002)(50466002)(305945005)(189998001)(7416002)(575784001)(6666003)(5660300001)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN3PR02MB1128; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; PTR:unknown-60-83.xilinx.com; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SN1NAM02FT019; 1:DplZ94Ys1KF8T1TycEFUA8pxs1JwwMJmk3kZh7+Hrkj3VWxF7c3kQEZJCB5/B9OqRQO0jN/cMlDtEPi6Aebqy+1K7pJG0LOzgHPO7tckYu6oMLZiPrUsclu5OTR2pPOQ MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 973e2d84-3255-4c71-13f4-08d4f15a2b77 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(8251501002)(300000503095)(300135400095)(2017052603199)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:BN3PR02MB1128; X-Microsoft-Exchange-Diagnostics: 1; BN3PR02MB1128; 3:TeD3SKWqF2LfegpDawH/Xk7hMD5vTzOUK3aDfuVNMgYaLsT1cyO+XiJqznhJS7kUopeuXb2RMnhKU5xflvxTRX/e1P31RtxWzx1IgZlaHGm8FQViCP2jJempVGykE/Z4HJ2ouo5U26eGwTcWIZhejDz8ezKwz7b/yDnfmWUdL+2iVkWR6lVo3su+5c14ouOY9dpU90IlsUKOnDd0R6aXn47KUN6mohTnf3p7sVsfeC2rqNhCY5sZmwzyc6z5wRTTdomtsRknqm96h1WlFJ2U5JZrx8r6N1CEEvGzki/f7WhSHj9alf8ZM1VuDXVwJD+LCi97noH4bvyxO2V5Kkdi0tEq5WM7urnoC3Qo2M7P7So=; 25:zcTdEjKXz0QtezSl2FymZDTZleW+bk4s+jjQQfArqNiVYzufJbufmczfKOW90AIv6h49UAlXbpveCM9xP8lM+F9s7VPgNtbM0FfTqioKKUq/o49AwcuqvKcTfTVmd8DEaK64DnXZtXugQ0CgQJeWTKAlaB1AlaU4CQwRzOhaBUxPEabm1Texc4bVF1rJdIbynHOW7ABJrkpOd03wTkDJoz1KsC6M9T7yLGSw2ipJeseV6GHBGUGkB2wS9MX3hDuABQqSo9q33oUaYUfjcTq8ktDAEgh71AgIS5UfEVlMib+5I3X26CAaujVMe90O05S63Thbnf47UZo7T6aKFFh6fw== X-MS-TrafficTypeDiagnostic: BN3PR02MB1128: X-Microsoft-Exchange-Diagnostics: 1; BN3PR02MB1128; 31:A5+WRwHLNR5hABb7jGoFCrQnBBL7aS+drJaykydNWGrhdPW06S+RGadBBRAeNSKZJsYIotzw52VGeipUQEpzILqTXkHcyoxYrzxU35aB6/zd3Aea/hTLGMLByxPppGcX/RJ9oYse4BxaZ+FT/m33Qlq3naKx+jClFd9ejbntfnR+gQxYxld1jCcGmELtubprfAVEPpgRQrimn+NJ3D9ETfAmDa/STmsWtxLWicZi4mg=; 20:PIYxCz3Mav7Yoq/sp40EWqqs0mWXS2PuyO/OxYlB2WGkoms7oXECQkSljcBCdvmIe40m4bhsRbpW6TeMgccH7lJ1t+V3rbx+fqTAK6Kk2ZWfhKn/0pwsgOcx5qQrKUL30WKnFkils5O6wjIbIq+1haPts7DLim1oFElRfawmt93Q/HqdlVkn0g/KA/RfpRGR7Wa3wZoKs+aSkXtIklkV7EVZsY4a8gHeH37mMXufrXEx91PKtikjjEXlSutIxKMhRUa3g92v1LCKHuYm3TM7/F4LgtmyHF8c0ovN2RJ8uSdRUubSOnyJ/tVtIpTbfluCa5K0dbniaUMhi6dmGVG6Xr0UwcI1JEex37Jtxiyf0IzXhJI1Tdsse/d6/x2Ulrcbjm56HmmOtCN1/aed6NX4q6DF6FbiMuXSaY8rX23bGQ2l5a5kZ02L8OcMk8xt2a4v+grMnjelFOQL6gTUIqMQgXBnoB9QicpgQzMQVFEkiVXA9D5JvghAjh0qin4nYlFV X-Exchange-Antispam-Report-Test: UriScan:(192813158149592)(104084551191319); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(8121501046)(5005006)(13018025)(13016025)(100000703101)(100105400095)(93006095)(93004095)(3002001)(10201501046)(6055026)(6041248)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123558100)(20161123564025)(20161123555025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BN3PR02MB1128; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BN3PR02MB1128; X-Microsoft-Exchange-Diagnostics: 1; BN3PR02MB1128; 4:XBdCGdf5eLLt+01HYeDg87KIskpHNCdyHz9b6EUyGqy2gwFT+x/v//OwM79bAlx1C6XSdfUidHzfd3m7g4iOpU1XGQ3Y8/9uqhLgKy4WDv99PCGggHxEDtbBPBEBd1HoFyXXciWuO8J2crQP2jyl5dWe3tXrsv7u7zGd0nKaXmkFtBQLIbHZ57UEmZCU/NnJ22e9i5qX+r0fLv8RYqOHdbotHIQTrdFl/Sbm/wYiAQWYJ5mMpyZB+R4Q7wkCu8AmcZCugmSooVFsai748Z9GWdZx12/9SlyUT7b5P/2tirZeo7hZ02loNktp45tBIK6oEckJx3NP44FC9wzeAVri5A== X-Forefront-PRVS: 0417A3FFD2 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN3PR02MB1128; 23:gaB/QcFietl6hizjwqegQu9nA6PmsnqsmbfM2xi+p?= fZ6/eH4ni+AnL1IXAG9OTmVARQZOpZJJZVkNtxdV4KFHWFYO0l79Tg7mpeRTBpNTpdIAhwTOHNOOr9JP9DlCD003Ord48n127n5iqlc5QmiVdEYVoz4Pk56GgcOR2CSz+Gptd9QicMJ6AcbJBxh80TPmsEcrmuilDeEz+Wb7HR8XRhlo3yk2hXRtyQplD4ckBC0ztkZd4DtiEXSNHfDGeHI/NigbKVvY11VCQeHHQvdfBOsFcU4dTqAYH+19vryPJzQeA/H9/SSaDVGn0DeskpJZbgbLJ9s+LEdRg+/5soreCk/L9eiOhg40kHblRSAa+aJrihgB8kMkTKKWJGrJJAxRcXqUoLBkFIk5woC4ZjenK65goASVTfEJQVedwBIE9ag6HUc73SXmkw0ykxlkQARlLl4gKcxVMEnYnXPauWXsMl9ONtYQUEF4M63MeP2jPaMPywtvsdDJDdGgI/Z613AHHb6itSMqACoa0xS46xDxvaGL0G4hYX1vGxQwF8ffwaC46251Ipzm9SGvuKKdhYhl6EiaIYbHFFUqQVWu6kypHstWe5AyDdRd6FKNc67V70oYv+t47sCAU8Q+eA7feKJD1aQZrbAcvh/U12FOH++NFJaK28yT8P4xsdRd4G7ODxHQa9aGF+qbh6LkyNx82gZPigmwNtUPIG9tO3L9BCrmyjpE9XIOEJgLbCiBTm9sU+EdplBR4AwqajPU+r6+lq3J1HfcOnc7jauXKumJa05TsZwKMLRuJ8JVG+cU6q8bZOWYzvEUW5FkeQyJ0GZKyo1ASmjFoaiBqAvBoIkEtUxG3Q9XSDsvfLsTef66BR9C8xEYqWUy1NJBY7a5Yl2ILuLJBRNnV7MNuPW9CfzBpVjQTyixfKhqNHrLFkbc+kYl8+N01Z8Cg4WTmiCcyU84Nxgg2hwhVxJ8q/Ug5hgFo+c/iSAlfTcwZPgNMTI5tYghL4Z1w6rEdVEhN2XglhU3TFlPuX3WQbM3EiaV0Kl/j3cISjYfibmV3i4OwI+S8yt8BY= X-Microsoft-Exchange-Diagnostics: 1; BN3PR02MB1128; 6:f/XWhVl5zBVGocwgc7B/4lbORO8/MyZHW1p6Avm4rSoLdSnvt2vqurl8kV6z1QIxlFwrZrioqrrBR+aG/I1s/J/FyW5WluK2v01+p3vUg+J4pLZlemdmwwirOIdkHYE8a9gkSeN9GZBq6yNAy9vzmfIYtnbWsKjUC3SoLSTSNkIqb+7rj7XFLOW2RSLtr+4i98g0cAixHb5O3H0CyeH4KvVaqjd356EJ6G5wYk9xfa1L09r+765ZZJnBHGqoiAY5RKhR6qDpuwE3/IalRZkfHT7IfSbU50HLUMksZMH+4JSt8D6+fvkhC+1KiqGaRnvyUNYUd6evrw3XIOooQpz1WA==; 5:oSZLRd8M/bOo0ijDZtdwC83b5yz5bUHY6gomUvHiMuu+Y1UsLSADV1Q24I5RG4Q8RiPfE1vJSsWp+IcB1TnTSf3Ja+9XdDfinYkTZj4sPUcFYc0+oqOudnSb0+MkqSLo0jZGcDV7bkBPF01QweRiZA==; 24:3iw7ZP3eLmCyhf9Q5weKZBq6zJopwiAeXoHo9atmiCprPmTOnMp7VnCUGyAZwyFyxj568b/i5srTFTGvXThF4t2IF+tridF4bA/QXYLoU2s=; 7:WAwTxmjNqU+heIQKkCc353um3uw4lBe9gkz7dvZsCwOUXkQ+sQnFmVQIycKWfwr3IZ8QKL5CZyiCFvCaThn9ihQCrwh1SFSO5kK3PHPbX+hq8se3MieU77VP86pW5jkUGj7Q1WYlgAcPTJTJnieayeofbXFkWbEHT8HbQs/GMEUPyGk64QP5ZAcWOPJarzP45Vq2UeF+kKS4et1ilj+by4Z3EdViXBbkOvoJ6Vq/j2Y= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Sep 2017 16:54:53.7313 (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: BN3PR02MB1128 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.32.50 Subject: [Qemu-devel] [PATCH v3 3/7] Convert single line fprintf(.../n) to warn_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: Kevin Wolf , James Hogan , Eduardo Habkost , "Michael S. Tsirkin" , Jason Wang , armbru@redhat.com, Max Reitz , Igor Mammedov , Gerd Hoffmann , Stefan Hajnoczi , pbonzini@redhat.com, Yongbok Kim , alistair23@gmail.com, alistair.francis@xilinx.com, Michael Roth , Aurelien Jarno , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Convert all the single line uses of fprintf(stderr, "warning:"..."\n"... to use warn_report() instead. This helps standardise on a single method of printing warnings to the user. All of the warnings were changed using this command: find ./* -type f -exec sed -i \ 's|fprintf(.*".*warning[,:] \(.*\)\\n"\(.*\));|warn_report("\1"\2);|Ig' \ {} + Some of the lines were manually edited to reduce the line length to below 80 charecters. The #include lines were manually updated to allow the code to compile. Signed-off-by: Alistair Francis Cc: Kevin Wolf Cc: Max Reitz Cc: "Michael S. Tsirkin" Cc: Igor Mammedov Cc: Paolo Bonzini Cc: Richard Henderson Cc: Eduardo Habkost Cc: Gerd Hoffmann Cc: Jason Wang Cc: Michael Roth Cc: James Hogan Cc: Aurelien Jarno Cc: Yongbok Kim Cc: Stefan Hajnoczi Reviewed-by: Markus Armbruster Reviewed-by: James Hogan [mips] --- block/vvfat.c | 4 +++- hw/acpi/core.c | 3 ++- hw/i386/pc.c | 2 +- hw/misc/applesmc.c | 2 +- hw/usb/hcd-ehci.c | 5 +++-- hw/virtio/virtio-balloon.c | 3 ++- net/hub.c | 3 ++- net/socket.c | 7 +++++-- qga/vss-win32.c | 2 +- target/mips/kvm.c | 4 ++-- trace/simple.c | 3 ++- ui/keymaps.c | 2 +- ui/spice-display.c | 2 +- 13 files changed, 26 insertions(+), 16 deletions(-) diff --git a/block/vvfat.c b/block/vvfat.c index a9e207f7f0..d682f0a9dc 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -32,6 +32,7 @@ #include "qapi/qmp/qbool.h" #include "qapi/qmp/qstring.h" #include "qemu/cutils.h" +#include "qemu/error-report.h" #ifndef S_IWGRP #define S_IWGRP 0 @@ -3028,7 +3029,8 @@ DLOG(checkpoint()); if (memcmp(direntries + k, array_get(&(s->directory), dir_index + k), sizeof(direntry_t))) { - fprintf(stderr, "Warning: tried to write to write-protected file\n"); + warn_report("tried to write to write-protected " + "file"); return -1; } } diff --git a/hw/acpi/core.c b/hw/acpi/core.c index 95fcac95a2..2a1b79c838 100644 --- a/hw/acpi/core.c +++ b/hw/acpi/core.c @@ -28,6 +28,7 @@ #include "qapi/opts-visitor.h" #include "qapi-visit.h" #include "qapi-event.h" +#include "qemu/error-report.h" struct acpi_table_header { uint16_t _length; /* our length, not actual part of the hdr */ @@ -221,7 +222,7 @@ static void acpi_table_install(const char unsigned *blob, size_t bloblen, } if (!has_header && changed_fields == 0) { - fprintf(stderr, "warning: ACPI table: no headers are specified\n"); + warn_report("ACPI table: no headers are specified"); } /* recalculate checksum */ diff --git a/hw/i386/pc.c b/hw/i386/pc.c index c882f8c2ea..ef5f30e644 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1310,7 +1310,7 @@ void pc_acpi_init(const char *default_dsdt) filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, default_dsdt); if (filename == NULL) { - fprintf(stderr, "WARNING: failed to find %s\n", default_dsdt); + warn_report("failed to find %s", default_dsdt); } else { QemuOpts *opts = qemu_opts_create(qemu_find_opts("acpi"), NULL, 0, &error_abort); diff --git a/hw/misc/applesmc.c b/hw/misc/applesmc.c index 7896812304..7be8b5f13c 100644 --- a/hw/misc/applesmc.c +++ b/hw/misc/applesmc.c @@ -331,7 +331,7 @@ static void applesmc_isa_realize(DeviceState *dev, Error **errp) s->iobase + APPLESMC_ERR_PORT); if (!s->osk || (strlen(s->osk) != 64)) { - fprintf(stderr, "WARNING: Using AppleSMC with invalid key\n"); + warn_report("Using AppleSMC with invalid key"); s->osk = default_osk; } diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c index 604912cb3e..46fd30b075 100644 --- a/hw/usb/hcd-ehci.c +++ b/hw/usb/hcd-ehci.c @@ -32,6 +32,7 @@ #include "hw/usb/ehci-regs.h" #include "hw/usb/hcd-ehci.h" #include "trace.h" +#include "qemu/error-report.h" #define FRAME_TIMER_FREQ 1000 #define FRAME_TIMER_NS (NANOSECONDS_PER_SECOND / FRAME_TIMER_FREQ) @@ -348,7 +349,7 @@ static void ehci_trace_sitd(EHCIState *s, hwaddr addr, static void ehci_trace_guest_bug(EHCIState *s, const char *message) { trace_usb_ehci_guest_bug(message); - fprintf(stderr, "ehci warning: %s\n", message); + warn_report("%s", message); } static inline bool ehci_enabled(EHCIState *s) @@ -1728,7 +1729,7 @@ static int ehci_state_fetchsitd(EHCIState *ehci, int async) /* siTD is not active, nothing to do */; } else { /* TODO: split transfers are not implemented */ - fprintf(stderr, "WARNING: Skipping active siTD\n"); + warn_report("Skipping active siTD"); } ehci_set_fetch_addr(ehci, async, sitd.next); diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c index a705e0ec55..37cde38982 100644 --- a/hw/virtio/virtio-balloon.c +++ b/hw/virtio/virtio-balloon.c @@ -26,6 +26,7 @@ #include "qapi/visitor.h" #include "qapi-event.h" #include "trace.h" +#include "qemu/error-report.h" #include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-access.h" @@ -292,7 +293,7 @@ static void virtio_balloon_receive_stats(VirtIODevice *vdev, VirtQueue *vq) s->stats_vq_offset = offset; if (qemu_gettimeofday(&tv) < 0) { - fprintf(stderr, "warning: %s: failed to get time of day\n", __func__); + warn_report("%s: failed to get time of day", __func__); goto out; } diff --git a/net/hub.c b/net/hub.c index 32d8cf5cd4..afe941ae7a 100644 --- a/net/hub.c +++ b/net/hub.c @@ -18,6 +18,7 @@ #include "clients.h" #include "hub.h" #include "qemu/iov.h" +#include "qemu/error-report.h" /* * A hub broadcasts incoming packets to all its ports except the source port. @@ -330,7 +331,7 @@ void net_hub_check_clients(void) } } if (has_host_dev && !has_nic) { - fprintf(stderr, "Warning: vlan %d with no nics\n", hub->id); + warn_report("vlan %d with no nics", hub->id); } if (has_nic && !has_host_dev) { fprintf(stderr, diff --git a/net/socket.c b/net/socket.c index 18af2ab5f3..daea750644 100644 --- a/net/socket.c +++ b/net/socket.c @@ -448,8 +448,11 @@ static NetSocketState *net_socket_fd_init(NetClientState *peer, case SOCK_STREAM: return net_socket_fd_init_stream(peer, model, name, fd, is_connected); default: - /* who knows ... this could be a eg. a pty, do warn and continue as stream */ - fprintf(stderr, "qemu: warning: socket type=%d for fd=%d is not SOCK_DGRAM or SOCK_STREAM\n", so_type, fd); + /* who knows ... this could be a eg. a pty, do warn and continue as + * stream + */ + warn_report("socket type=%d for fd=%d is not SOCK_DGRAM or " + "SOCK_STREAM", so_type, fd); return net_socket_fd_init_stream(peer, model, name, fd, is_connected); } return NULL; diff --git a/qga/vss-win32.c b/qga/vss-win32.c index a80933c98b..b748b9ff57 100644 --- a/qga/vss-win32.c +++ b/qga/vss-win32.c @@ -61,7 +61,7 @@ static bool vss_check_os_version(void) return false; } if (wow64) { - fprintf(stderr, "Warning: Running under WOW64\n"); + warn_report("Running under WOW64"); } #endif return !wow64; diff --git a/target/mips/kvm.c b/target/mips/kvm.c index 3317905e71..a23aa438d2 100644 --- a/target/mips/kvm.c +++ b/target/mips/kvm.c @@ -95,11 +95,11 @@ void kvm_mips_reset_vcpu(MIPSCPU *cpu) CPUMIPSState *env = &cpu->env; if (!kvm_mips_fpu_cap && env->CP0_Config1 & (1 << CP0C1_FP)) { - fprintf(stderr, "Warning: KVM does not support FPU, disabling\n"); + warn_report("KVM does not support FPU, disabling"); env->CP0_Config1 &= ~(1 << CP0C1_FP); } if (!kvm_mips_msa_cap && env->CP0_Config3 & (1 << CP0C3_MSAP)) { - fprintf(stderr, "Warning: KVM does not support MSA, disabling\n"); + warn_report("KVM does not support MSA, disabling"); env->CP0_Config3 &= ~(1 << CP0C3_MSAP); } diff --git a/trace/simple.c b/trace/simple.c index a221a3f703..e82018d923 100644 --- a/trace/simple.c +++ b/trace/simple.c @@ -15,6 +15,7 @@ #include "qemu/timer.h" #include "trace/control.h" #include "trace/simple.h" +#include "qemu/error-report.h" /** Trace file header event ID, picked to avoid conflict with real event IDs */ #define HEADER_EVENT_ID (~(uint64_t)0) @@ -405,7 +406,7 @@ bool st_init(void) thread = trace_thread_create(writeout_thread); if (!thread) { - fprintf(stderr, "warning: unable to initialize simple trace backend\n"); + warn_report("unable to initialize simple trace backend"); return false; } diff --git a/ui/keymaps.c b/ui/keymaps.c index fa00b82027..7fa21f81b2 100644 --- a/ui/keymaps.c +++ b/ui/keymaps.c @@ -141,7 +141,7 @@ static kbd_layout_t *parse_keyboard_layout(const name2keysym_t *table, int keysym; keysym = get_keysym(table, keyname); if (keysym == 0) { - /* fprintf(stderr, "Warning: unknown keysym %s\n", line);*/ + /* warn_report("unknown keysym %s", line);*/ } else { const char *rest = line + offset + 1; int keycode = strtol(rest, NULL, 0); diff --git a/ui/spice-display.c b/ui/spice-display.c index 042292cc90..0963c7825f 100644 --- a/ui/spice-display.c +++ b/ui/spice-display.c @@ -850,7 +850,7 @@ static void qemu_spice_gl_unblock_bh(void *opaque) static void qemu_spice_gl_block_timer(void *opaque) { - fprintf(stderr, "WARNING: spice: no gl-draw-done within one second\n"); + warn_report("spice: no gl-draw-done within one second"); } static void spice_gl_refresh(DisplayChangeListener *dcl)