From patchwork Fri Sep 1 16:51:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 808834 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="hYzxkxSv"; 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 3xkQTb2mjHz9t3F for ; Sat, 2 Sep 2017 03:00:03 +1000 (AEST) Received: from localhost ([::1]:50150 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dnpIX-0001mm-GU for incoming@patchwork.ozlabs.org; Fri, 01 Sep 2017 13:00:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51051) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dnpDt-00061k-OF for qemu-devel@nongnu.org; Fri, 01 Sep 2017 12:55:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dnpDo-00069v-HB for qemu-devel@nongnu.org; Fri, 01 Sep 2017 12:55:13 -0400 Received: from mail-co1nam03on0066.outbound.protection.outlook.com ([104.47.40.66]:35376 helo=NAM03-CO1-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 1dnpDo-00067g-4g for qemu-devel@nongnu.org; Fri, 01 Sep 2017 12:55:08 -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=2AtWTyeB4XhFuihSm7pSzpZNgzlhS1P62ou0+6wFiMk=; b=hYzxkxSv3ImMp5tvjxwTqIqzNxvFb7DEvT3EKk2svlLrCIhhmVZlGOOWnL0EXyNdgkIk6TUx2kmxLWidPhWmlsOsBwbn4c9aq8WxovQKND+0uYq3ywr/1umz1PEojVrnOe75qOuk21abblW4Fiugda7YV3mVCn0Pek8RMP9htzk= Received: from BY2PR02CA0107.namprd02.prod.outlook.com (10.163.44.161) by CY1PR0201MB1929.namprd02.prod.outlook.com (10.163.56.27) 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:55:05 +0000 Received: from BL2NAM02FT022.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e46::207) by BY2PR02CA0107.outlook.office365.com (2a01:111:e400:5261::33) 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:55:04 +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 BL2NAM02FT022.mail.protection.outlook.com (10.152.77.153) 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:55:04 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:57482 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1dnpDj-0000Pr-Gy; Fri, 01 Sep 2017 09:55:03 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1dnpDj-0003lD-DQ; Fri, 01 Sep 2017 09:55:03 -0700 Received: from xsj-pvapsmtp01 (xsj-smtp1.xilinx.com [149.199.38.66]) by xsj-smtp-dlp2.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id v81Gsvdg028991; Fri, 1 Sep 2017 09:54:57 -0700 Received: from [172.19.2.220] (helo=localhost.localdomain) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1dnpDd-0003fM-81; Fri, 01 Sep 2017 09:54:57 -0700 From: Alistair Francis To: Date: Fri, 1 Sep 2017 09:51:21 -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.100; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(438002)(189002)(199003)(33646002)(189998001)(2950100002)(2351001)(36756003)(5003940100001)(305945005)(50986999)(106466001)(36386004)(76176999)(6916009)(6666003)(50226002)(110136004)(77096006)(8936002)(118296001)(8676002)(81166006)(81156014)(63266004)(478600001)(9786002)(4326008)(48376002)(54906002)(356003)(626005)(5660300001)(50466002)(47776003)(39060400002)(2906002)(107986001)(5001870100001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0201MB1929; H:xsj-pvapsmtpgw02; FPR:; SPF:Pass; PTR:unknown-60-100.xilinx.com,xapps1.xilinx.com; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2NAM02FT022; 1:YvldCsy9Q87GHNhLMFjn2eKwMTM/0aM+nK5m9zGpLVgL/taWJR8Xs31ffepD9PWclV14NyJbqkscA3ypObXTN2PYOYNwZrU9mzxv2jgqPj0IySMpSB6xyJN9RwnlSM6U MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 15155e24-f806-43a5-87c9-08d4f15a3163 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(300000502095)(300135100095)(22001)(2017030254152)(8251501002)(300000503095)(300135400095)(2017052603199)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:CY1PR0201MB1929; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0201MB1929; 3:UhgYGVOKZO7jcGh++USgE74NI0OdEo0mHCM7148PJaPokokKJQEQWtUlqLFpdhFnTZmUKrDCtnfIM1wEh+Oannol810rqpcYM6/z6Em5OMplg700ojNo5mUEGkTbUUG9curiQnmX6EhRTO+T2jpl6DZmOJtO1lIfOa5sTc7M0Pn2A6ViqtBl+tj4U8o5Z/IFNaOFtKk9Pgk/UUx0Cifv1BVSinNv5ZkXmEnAZa0/50nT87U5Wj+ZGqBeGMKkDeXoCotU63Gq0Ib6aYsAUmRMvIgOnZxi+FLHqFZFjKJytC0m0tkjMeyZGRo4D4ShNPs4lnSyICjD9b6J3kjK8joEG53BSX9bSCvPTdxg19TaBJA=; 25:f6E6gTt8X4KVlh+O5dqauKNzaMQPgTs5cBPGz55/TxdEGwDtFTB/e8gPHq0jRc5YWng5WnEMyTQm2pJ7At8tIWsHaGF7tuBah5UvFYmOk4GhbP6nfvM6iyywlKftR2Vwfxd2yCKttB86dsdQxQRPPLHW1SH0qOwfWyOH8b7hXGi/W2H0/k5a37u9PsWAAspTBU+KfbFy13rhDEv1guzP1QqV8qfKE/NLlhVscHPFnOYQ6VCfQl2/fUcowQnmJsS3yAaGKV/mjmDlZo2Myv00oE4Vr4SIc/wuk6K9JVFkye3d7TKnRRY9D4Y4QJ8gC3Klf9/DnSN4UhpTa1YKKVL7DQ== X-MS-TrafficTypeDiagnostic: CY1PR0201MB1929: X-Microsoft-Exchange-Diagnostics: 1; CY1PR0201MB1929; 31:MSNAvEmMlX77OWblsDlsdrV+KZwzyV+N4r3EJY5RdA1ouLpdO8UrBlo9uJNblV9Z7xSopKMxORi6YJjjMPTbs47uuIMUmEAOvoJEeie+NwvaGqEXUQeTRsyibaMwhPko5LZWwUQtguBdcE7egaZwKtGQx3HHD8MsxV7GIoAbC7GqAKhN+mXDrNxNVHRyHrR4UG/SwNRzumRait0MTr19NO7C0X8tomgSWvQxJB3IpNE=; 20:j2DTpEfwckJpYVfTD3d+JLXPMjiK0pzGBO6Tv+uVFr3+xKe4aj6kuKEX+Y3AYgCk19J7FpOaZK+T+aBxxxT3x0/mlaMfk9vgtIYTDBEXjrv+J7nhLzjXN2YmVyehIBLrhixvdKELbqjK0DwgX+8FizX82rLmJTQ1Rkx72wnp8mr/8nxVbQLXsMUgeqkCeqejTS2/p85aHDoKUpRdeyaqsE33kmbfOJx4LahjvbF+WOxTxNA93SJIpaiiRK6UWTF7oLfnfsC7dFCrcabx4b6AUPCJgt/RJh4qo9rQG1y7SM72HINsEuaiyWaM7Kxhc02qLh+TxuO/SkkH7HdvBfmbI7bT04WwvGjlwRV3UpJf9pAFFZRdkm/ve5t3X+sXxyoy+K+C/j09vHFsig51rlBhyBlQMgbS23wrDZTPhPhUEAY3VsjXBT7RzMhQtX096E5V4SETZmNilZXWhBxRzdsM/wS/RYj3pTpBLfxjaA3ayRvNqnYS6X5i2Vx9yCIfJVNm X-Exchange-Antispam-Report-Test: UriScan:(192813158149592); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(13018025)(13016025)(8121501046)(5005006)(100000703101)(100105400095)(3002001)(93006095)(93004095)(10201501046)(6055026)(6041248)(20161123558100)(20161123562025)(20161123564025)(20161123560025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY1PR0201MB1929; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY1PR0201MB1929; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0201MB1929; 4:1m6GX0O78wxuprWSYZns0M5rqvoBUS4yVnFgH3UOfmTHLZ/4oY+RIVTSXr1DiFJABk7Ae8wOvVl+GffeWPBrBdRIDHmqyT56UneYnrlASsh3iu/VGGfisnIsJ0jvrHEtfI6gxo0gskDyPFBXgHf3lQS5uJcGGUgSz5dQPx0WQIeOodWsFk5Z0tBzGpU8wsh14c2gKMsc659RaGo1+fcDedgcJlbGtXf9/Tz/klp83/oSAK8Cer+vKdYmDHAqnvnPXSrHxBcJuqrpJNIdRt7hxlNiYcfLGpywQA6mBm+lsaA= X-Forefront-PRVS: 0417A3FFD2 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0201MB1929; 23:OodifIGH+b124ktcqbjckMopYVxuyrO2Bp7vVP6?= ApnMSrnNbrqNiyLty81tdI5seeCLofaSta3YH6fVKVHUrSxuyY3uJT5vhm0WbGosSZfw89wc6X2wiR9Z5vtSsNjMO6Rb3nHdAoZfF5rHgvngfuEe0n/MqNqIuFacc3DbVJtMJ+trseqa9ZJSd4YycCw1rU8tQgwPq61fhK46Nhcz9GQpESN2VOAzJ1dge/E48lOWckc83TsSAl2KC3dx2PKwJr/Ku2IbX6kfJKMaGR6le4RrzwvcK135LUSEmLXoyw8fht40hlFxI/CsGoQnQqfITDapcu1s6VfT5zqBFODnc6gs54Oj+aOYqEgrmN9b/EHEwLK30WVHpBrgeEMTuOu0iuY/jImErLCFfkwsFg0yoy4c22zvK2W+DFskeJF+hWJFhpJfE1hC40mJO41CAtbUSmidDuw3YwT13xq+oBTGvSknHOMmaasRIfB+eaCGsG5n2ZEVgh0zmOFIocUXWOf2i8bYb60VZ2exs/v/1Q4SMkAgRCkCpXwsuahQhzZbm04lRzqn2KhYCj0LpDdtyikv9bQ7saZj+xizJTXQuPN1IvZifH18aYeknYrw8pK+fRsjfaesJ3rvmaLDphC6B/Mu5VW3bWp891D6oLFmN28Lerwwu2MkScAt0fk04Y7wMZbuE7FjqkZvAUDwF3Zu1odDAoD8zwy2EfM5+wbQKdTDaZI8J+wEcKXrcRcMFJ1JLl/kJcjyPy6Ai4/tBINSxDJ0ck5zotCdg8wmHrtsJMDDqPNz7D+MCFXqIjO1EtP78Mt76UXbpVJh8jCf6UZLpQtJ9y00yWeWMVTURSPGES0DdeoueQu8d5J4j5sBOM8oV5oTcPpR9lHFndwnx3c4wZMYG8MAHsQn2PISA4E0D+k1HenqAWsqiFwlxP5VOstNwk1FhVQdMmbdLxnxY8la4fbqaohB3+Hy7S00hYTyqrdhuPp2N4NJ+fHps6fMa4BA9/5xyNv0+uUwrh4ezF3298t3I X-Microsoft-Exchange-Diagnostics: 1; CY1PR0201MB1929; 6:C5RIUkkn67cX3HPVE2jsUblXz2kAwz8VzlA+IoDtae1qJNFvPkWuKBoTjABA/uqhUH69ScP/1QAPdK36c/oYuPodnzMmKDIGC6h8EeqfDEKuZanjNPn5NO1F2EUsO4N8hgDERsCnfi3IVsn+lx7z0u/SYsgkPYppsG1cXHKbxsSHpXYo0yb8EkEMJza/jCUQQHfEneVDvS7gTXhtAcGZOOy8rJRBydEgj5QhZyKRr8d5Zj6XM3vMjSU6SotrADFMmaQtBA9WNz9ku1NX6aoQhEK8KVtEq0nEJ8e3qJ6WWY4RMBl1wENxm2AxAPK7e6oQ2l+ScSoURAaqYwZ+N4yOjQ==; 5:B5bU0BbfXkh3QEt5brxPC4+wgR/+xjda/WkhSc26FYW+20/nM3q9ctbB9q7mBxeOn2TtJSehnnV4EfsQQzXZA6T0h4NTX7nybeY/YBctuA0c24iISStLOaJUfiqL7pTUJXj+POgc10ovn/g74VT1vQ==; 24:8368QoW8WzD2uWkm0tqLzBff+jRYUh5Y+4JqzcI5EX4z4jtuBD7E624BD22vMgFH723ja2gS4c5FP0dcu+FAlnRiWVdMfHDrZecFAY6Q3L8=; 7:CIQ9Wg5o3BttEAHyaweHDuN0rDv7uhjAiC0+ELYe8Ljt6aPD9zbDAX7SmNdQrVlp64rikOzJpj9C8/3UG3vOj8lI1eQTN6PO1N43NTRb0XpHxmocsIqj0+OyNnxGoGV46XRxY4Ot1Dpnhb0zCSaw99iyb3mmDgVnn3T+N3aIMPslF02CWACva2ui69E4rNucStOk6JsCVDTBlVu9+i7JBAdGAT6LxJplptLs7kzy+DY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Sep 2017 16:55:04.0914 (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.100]; Helo=[xsj-pvapsmtpgw02] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0201MB1929 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.40.66 Subject: [Qemu-devel] [PATCH v3 5/7] General warn report fixups 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, pbonzini@redhat.com, armbru@redhat.com, alistair.francis@xilinx.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Tidy up some of the warn_report() messages after having converted them to use warn_report(). Signed-off-by: Alistair Francis Reviewed-by: Markus Armbruster --- block/vvfat.c | 3 +-- hw/arm/vexpress.c | 2 +- hw/i386/xen/xen-mapcache.c | 2 +- hw/mips/mips_malta.c | 4 ++-- hw/mips/mips_r4k.c | 3 +-- hw/s390x/s390-virtio.c | 7 ++++--- net/hub.c | 6 ++---- net/net.c | 5 +++-- target/i386/hax-mem.c | 5 ++--- target/ppc/translate_init.c | 3 +-- ui/keymaps.c | 3 +-- 11 files changed, 19 insertions(+), 24 deletions(-) diff --git a/block/vvfat.c b/block/vvfat.c index 04801f3136..55f416868a 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -1227,8 +1227,7 @@ static int vvfat_open(BlockDriverState *bs, QDict *options, int flags, switch (s->fat_type) { case 32: - warn_report("FAT32 has not been tested. " - "You are welcome to do so!"); + warn_report("FAT32 has not been tested. You are welcome to do so!"); break; case 16: case 12: diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index 2445eb4408..fa53cf96b4 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -492,7 +492,7 @@ static void vexpress_modify_dtb(const struct arm_boot_info *info, void *fdt) * happen with older device tree blobs. */ warn_report("couldn't find interrupt controller in " - "dtb; will not include virtio-mmio devices in the dtb."); + "dtb; will not include virtio-mmio devices in the dtb"); } else { int i; const hwaddr *map = daughterboard->motherboard_map; diff --git a/hw/i386/xen/xen-mapcache.c b/hw/i386/xen/xen-mapcache.c index 91a4fd6984..baab93b614 100644 --- a/hw/i386/xen/xen-mapcache.c +++ b/hw/i386/xen/xen-mapcache.c @@ -127,7 +127,7 @@ void xen_map_cache_init(phys_offset_to_gaddr_t f, void *opaque) if (rlimit_as.rlim_max != RLIM_INFINITY) { warn_report("QEMU's maximum size of virtual" - " memory is not infinity."); + " memory is not infinity"); } if (rlimit_as.rlim_max < MCACHE_MAX_SIZE + NON_MCACHE_MEMORY_SIZE) { mapcache->max_mcache_size = rlimit_as.rlim_max - diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 233e2ee802..b8ba684c93 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -216,8 +216,8 @@ static void generate_eeprom_spd(uint8_t *eeprom, ram_addr_t ram_size) } if (ram_size) { - warn_report("SPD cannot represent final %dMB" - " of SDRAM", (int)ram_size); + warn_report("SPD cannot represent final "RAM_ADDR_FMT"MB" + " of SDRAM", ram_size); } /* fill in SPD memory information */ diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c index 6ffb88fd70..b48a4d72ac 100644 --- a/hw/mips/mips_r4k.c +++ b/hw/mips/mips_r4k.c @@ -254,8 +254,7 @@ void mips_r4k_init(MachineState *machine) } } else if (!qtest_enabled()) { /* not fatal */ - warn_report("could not load MIPS bios '%s'", - bios_name); + warn_report("could not load MIPS bios '%s'", bios_name); } g_free(filename); diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c index 964df517b4..946f23fc23 100644 --- a/hw/s390x/s390-virtio.c +++ b/hw/s390x/s390-virtio.c @@ -146,9 +146,10 @@ void gtod_save(QEMUFile *f, void *opaque) r = s390_get_clock(&tod_high, &tod_low); if (r) { - warn_report("Unable to get guest clock for migration. " - "Error code %d. Guest clock will not be migrated " - "which could cause the guest to hang.", r); + warn_report("Unable to get guest clock for migration: %s", + strerror(-r)); + error_printf("Guest clock will not be migrated " + "which could cause the guest to hang."); qemu_put_byte(f, S390_TOD_CLOCK_VALUE_MISSING); return; } diff --git a/net/hub.c b/net/hub.c index 745a2168a1..14b4eec68f 100644 --- a/net/hub.c +++ b/net/hub.c @@ -310,8 +310,7 @@ void net_hub_check_clients(void) QLIST_FOREACH(port, &hub->ports, next) { peer = port->nc.peer; if (!peer) { - warn_report("hub port %s has no peer", - port->nc.name); + warn_report("hub port %s has no peer", port->nc.name); continue; } @@ -334,8 +333,7 @@ void net_hub_check_clients(void) warn_report("vlan %d with no nics", hub->id); } if (has_nic && !has_host_dev) { - warn_report("vlan %d is not connected to host network", - hub->id); + warn_report("vlan %d is not connected to host network", hub->id); } } } diff --git a/net/net.c b/net/net.c index 45ab2a1a02..5e5e27f7e0 100644 --- a/net/net.c +++ b/net/net.c @@ -1482,8 +1482,9 @@ void net_check_clients(void) QTAILQ_FOREACH(nc, &net_clients, next) { if (!nc->peer) { warn_report("%s %s has no peer", - nc->info->type == NET_CLIENT_DRIVER_NIC ? - "nic" : "netdev", nc->name); + nc->info->type == NET_CLIENT_DRIVER_NIC + ? "nic" : "netdev", + nc->name); } } diff --git a/target/i386/hax-mem.c b/target/i386/hax-mem.c index 756f2dd268..ad1248fece 100644 --- a/target/i386/hax-mem.c +++ b/target/i386/hax-mem.c @@ -178,9 +178,8 @@ static void hax_process_section(MemoryRegionSection *section, uint8_t flags) if (!memory_region_is_ram(mr)) { if (memory_region_is_romd(mr)) { /* HAXM kernel module does not support ROMD yet */ - warn_report("Ignoring ROMD region 0x%016" PRIx64 - "->0x%016" PRIx64 "", __func__, start_pa, - start_pa + size); + warn_report("Ignoring ROMD region 0x%016"PRIx64"->0x%016"PRIx64"", + start_pa, start_pa + size); } return; } diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c index 989c104b76..be09aadfd9 100644 --- a/target/ppc/translate_init.c +++ b/target/ppc/translate_init.c @@ -9230,8 +9230,7 @@ static void init_ppc_proc(PowerPCCPU *cpu) } #endif if (env->check_pow == NULL) { - warn_report("no power management check handler " - "registered." + warn_report("no power management check handler registered." " Attempt QEMU to crash very soon !"); } } diff --git a/ui/keymaps.c b/ui/keymaps.c index a6cefdaff9..f9762d1497 100644 --- a/ui/keymaps.c +++ b/ui/keymaps.c @@ -198,8 +198,7 @@ int keysym2scancode(void *kbd_layout, int keysym) if (keysym < MAX_NORMAL_KEYCODE) { if (k->keysym2keycode[keysym] == 0) { trace_keymap_unmapped(keysym); - warn_report("no scancode found for keysym %d", - keysym); + warn_report("no scancode found for keysym %d", keysym); } return k->keysym2keycode[keysym]; } else {