From nobody Sat Feb 7 06:55:33 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1505826749187490.65763487361994; Tue, 19 Sep 2017 06:12:29 -0700 (PDT) Received: from localhost ([::1]:42772 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duIKC-00067Y-Df for importer@patchew.org; Tue, 19 Sep 2017 09:12:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60189) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duHfc-0004R2-Uv for qemu-devel@nongnu.org; Tue, 19 Sep 2017 08:30:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1duHfZ-0005eO-Rb for qemu-devel@nongnu.org; Tue, 19 Sep 2017 08:30:31 -0400 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:37673) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1duHfZ-0005cv-GU for qemu-devel@nongnu.org; Tue, 19 Sep 2017 08:30:29 -0400 Received: by mail-wr0-x243.google.com with SMTP id u48so2146468wrf.4 for ; Tue, 19 Sep 2017 05:30:27 -0700 (PDT) Received: from 640k.lan (dynamic-adsl-78-12-246-117.clienti.tiscali.it. [78.12.246.117]) by smtp.gmail.com with ESMTPSA id k18sm1292878wmd.22.2017.09.19.05.30.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Sep 2017 05:30:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=h8ZPbtcn5IfepP4X2bXOUdEm4rdtj+PrHyrCROaZt4c=; b=P0p+FKADJNIJRyWV9miUdh1iyUONO5AxBaYK7wza1Xd0fXTwsBpJ33til4og1DGY4h yuYNCV/wvPK458jeQGY/EA19lNQWkPUgE6MEg9Uou1zxIJ8O+S3Z0TD9QOcB97qWTD/2 lG/AAXycc0u7Wfln7SfOP96YnVLhnvbHHAGu+YTF11EXGM7qcXN4MoWELH6UZ79J22yC osDPWPgPUk3vTe+aVoHdKyIHtC/K9OvguGk5T/sptxf18MzQUga6Rf/tSh/kGHkHfxMB nL07ax6amzJLNFYYhQZn39hSiqQWhMuiWVnAVPz3tM9rU3gGx1v2WmMdBl1D9Hk3oA7X WH2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=h8ZPbtcn5IfepP4X2bXOUdEm4rdtj+PrHyrCROaZt4c=; b=QUKbMyNUA+2oafQ85lxhgt1BI+7oFuABJlONj3ceoIHNi0/Te6U7n9brOGU0zDR1tM rGD8nkKdsoYCrQariZOcSEC9lkpSHpYlfPGYz/Idbkmfjv5LMRzRhfTA3rMfLtbT0PKL NEsBh+F5bKW0IO62YsJqT1vjKS7j0PJsaoLAP1levjxxdbjjI3NvlEFz8Y424AVPGCfn iYUR7cLprZCh2ZM7UZjGrAW+lr02O4CVYY18mGLhKP1tUZtPgG0oM2zHTCYtgJazKrCp AedwhkfHDK9+w4El6uMTfh6IY/5aw6kUhQvq7SJPLdS1KhMjoDRhgH01baEeCa//MHNT 0yQA== X-Gm-Message-State: AHPjjUg2s5L/f+IVJRATzxxq2Gc9XXvvj7zUlfAN00OvQRmPHQ6AidTJ 4/+Oof0vwkiJioQU2AoZIZb/TtUG X-Google-Smtp-Source: AOwi7QDLsOsFOXTawE4PAGVuK/4noQj/hDrY7lISU6dvvpvcFfdVYr9ofCQXnxlnrawRSSSaSRl4Lg== X-Received: by 10.223.174.227 with SMTP id y90mr1276265wrc.205.1505824225876; Tue, 19 Sep 2017 05:30:25 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 19 Sep 2017 14:29:26 +0200 Message-Id: <1505824179-21541-38-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1505824179-21541-1-git-send-email-pbonzini@redhat.com> References: <1505824179-21541-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::243 Subject: [Qemu-devel] [PULL 37/50] 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: Alistair Francis Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Alistair Francis 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 Message-Id: <9cb1d23551898c9c9a5f84da6773e99871285120.1505158760.git.alista= ir.francis@xilinx.com> Signed-off-by: Paolo Bonzini --- 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 | 14 ++++++++------ net/hub.c | 6 ++---- net/net.c | 5 +++-- target/i386/hax-mem.c | 6 +++--- target/ppc/translate_init.c | 3 +-- ui/keymaps.c | 3 +-- 11 files changed, 24 insertions(+), 27 deletions(-) diff --git a/block/vvfat.c b/block/vvfat.c index 6659a4a..cbabb36 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -1227,8 +1227,7 @@ static int vvfat_open(BlockDriverState *bs, QDict *op= tions, int flags, =20 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 f72ee66..96c5eeb 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -494,7 +494,7 @@ static void vexpress_modify_dtb(const struct arm_boot_i= nfo *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 =3D daughterboard->motherboard_map; diff --git a/hw/i386/xen/xen-mapcache.c b/hw/i386/xen/xen-mapcache.c index 91a4fd6..baab93b 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) =20 if (rlimit_as.rlim_max !=3D 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 =3D rlimit_as.rlim_max - diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 233e2ee..7d6e583 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_ad= dr_t ram_size) } =20 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); } =20 /* fill in SPD memory information */ diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c index 6ffb88f..b48a4d7 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); =20 diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c index 25781f0..0e91c46 100644 --- a/hw/s390x/s390-virtio.c +++ b/hw/s390x/s390-virtio.c @@ -141,9 +141,10 @@ void gtod_save(QEMUFile *f, void *opaque) =20 r =3D 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; } @@ -170,9 +171,10 @@ int gtod_load(QEMUFile *f, void *opaque, int version_i= d) =20 r =3D s390_set_clock(&tod_high, &tod_low); if (r) { - warn_report("Unable to set guest clock value. " - "s390_get_clock returned error %d. This could cause " - "the guest to hang.", r); + warn_report("Unable to set guest clock for migration: %s", + strerror(-r)); + error_printf("Guest clock will not be restored " + "which could cause the guest to hang."); } =20 return 0; diff --git a/net/hub.c b/net/hub.c index 745a216..14b4eec 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 =3D 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; } =20 @@ -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->i= d); } } } diff --git a/net/net.c b/net/net.c index 1301cdb..39ef546 100644 --- a/net/net.c +++ b/net/net.c @@ -1494,8 +1494,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 =3D=3D NET_CLIENT_DRIVER_NIC ? - "nic" : "netdev", nc->name); + nc->info->type =3D=3D NET_CLIENT_DRIVER_NIC + ? "nic" : "netdev", + nc->name); } } =20 diff --git a/target/i386/hax-mem.c b/target/i386/hax-mem.c index 756f2dd..27a0d21 100644 --- a/target/i386/hax-mem.c +++ b/target/i386/hax-mem.c @@ -12,6 +12,7 @@ #include "cpu.h" #include "exec/address-spaces.h" #include "exec/exec-all.h" +#include "qemu/error-report.h" =20 #include "target/i386/hax-i386.h" #include "qemu/queue.h" @@ -178,9 +179,8 @@ static void hax_process_section(MemoryRegionSection *se= ction, 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" PR= Ix64, + start_pa, start_pa + size); } return; } diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c index 49190ec..466bf97 100644 --- a/target/ppc/translate_init.c +++ b/target/ppc/translate_init.c @@ -9321,8 +9321,7 @@ static void init_ppc_proc(PowerPCCPU *cpu) } #endif if (env->check_pow =3D=3D 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 a6cefda..f9762d1 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] =3D=3D 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 { --=20 1.8.3.1