From nobody Wed Nov 5 22:37:45 2025 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; 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 153780430206067.85538272130361; Mon, 24 Sep 2018 08:51:42 -0700 (PDT) Received: from localhost ([::1]:45788 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g4T95-0004nL-28 for importer@patchew.org; Mon, 24 Sep 2018 11:51:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53690) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g4T50-0001Cq-Rc for qemu-devel@nongnu.org; Mon, 24 Sep 2018 11:47:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g4T4w-0003jj-CH for qemu-devel@nongnu.org; Mon, 24 Sep 2018 11:47:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47708) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1g4T4w-0003jO-4D for qemu-devel@nongnu.org; Mon, 24 Sep 2018 11:47:18 -0400 Received: from smtp.corp.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7B6648830E; Mon, 24 Sep 2018 15:47:17 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-98.ams2.redhat.com [10.36.116.98]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 16EDB309138F; Mon, 24 Sep 2018 15:47:02 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 82971113860E; Mon, 24 Sep 2018 17:46:55 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Mon, 24 Sep 2018 17:46:54 +0200 Message-Id: <20180924154655.23666-4-armbru@redhat.com> In-Reply-To: <20180924154655.23666-1-armbru@redhat.com> References: <20180924154655.23666-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 24 Sep 2018 15:47:17 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 3/4] Drop "qemu:" prefix from error_report() arguments 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: Mao Zhongyi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Mao Zhongyi error_report and friends already add a "qemu-system-xxx" prefix to the string, so a "qemu:" prefix is redundant in the string. Just drop it. Reported-by: Thomas Huth Signed-off-by: Mao Zhongyi Reviewed-by: Eduardo Habkost Message-Id: <1537495530-580-1-git-send-email-maozhongyi@cmss.chinamobile.co= m> Acked-by: David Gibson Signed-off-by: Markus Armbruster --- hw/i386/multiboot.c | 8 ++++---- hw/ppc/e500.c | 4 ++-- hw/ppc/sam460ex.c | 8 ++++---- hw/riscv/sifive_e.c | 2 +- hw/riscv/sifive_u.c | 2 +- hw/riscv/spike.c | 2 +- hw/riscv/virt.c | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c index d519e206c5..1a4344f5fc 100644 --- a/hw/i386/multiboot.c +++ b/hw/i386/multiboot.c @@ -181,12 +181,12 @@ int load_multiboot(FWCfgState *fw_cfg, if (!is_multiboot) return 0; /* no multiboot */ =20 - mb_debug("qemu: I believe we found a multiboot image!"); + mb_debug("I believe we found a multiboot image!"); memset(bootinfo, 0, sizeof(bootinfo)); memset(&mbs, 0, sizeof(mbs)); =20 if (flags & 0x00000004) { /* MULTIBOOT_HEADER_HAS_VBE */ - error_report("qemu: multiboot knows VBE. we don't."); + error_report("multiboot knows VBE. we don't"); } if (!(flags & 0x00010000)) { /* MULTIBOOT_HEADER_HAS_ADDR */ uint64_t elf_entry; @@ -216,7 +216,7 @@ int load_multiboot(FWCfgState *fw_cfg, exit(1); } =20 - mb_debug("qemu: loading multiboot-elf kernel " + mb_debug("loading multiboot-elf kernel " "(%#x bytes) with entry %#zx", mb_kernel_size, (size_t)mh_entry_addr); } else { @@ -270,7 +270,7 @@ int load_multiboot(FWCfgState *fw_cfg, mb_debug("multiboot: load_addr =3D %#x", mh_load_addr); mb_debug("multiboot: load_end_addr =3D %#x", mh_load_end_addr); mb_debug("multiboot: bss_end_addr =3D %#x", mh_bss_end_addr); - mb_debug("qemu: loading multiboot kernel (%#x bytes) at %#x", + mb_debug("loading multiboot kernel (%#x bytes) at %#x", mb_load_size, mh_load_addr); =20 mbs.mb_buf =3D g_malloc(mb_kernel_size); diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index 7d19b1498c..e6747fce28 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -1000,7 +1000,7 @@ void ppce500_init(MachineState *machine) payload_size =3D load_uimage(filename, &bios_entry, &loadaddr, NUL= L, NULL, NULL); if (payload_size < 0) { - error_report("qemu: could not load firmware '%s'", filename); + error_report("could not load firmware '%s'", filename); exit(1); } } @@ -1056,7 +1056,7 @@ void ppce500_init(MachineState *machine) */ dt_base =3D (loadaddr + payload_size + DTC_LOAD_PAD) & ~DTC_PAD_MASK; if (dt_base + DTB_MAX_SIZE > ram_size) { - error_report("qemu: not enough memory for device tree"); + error_report("not enough memory for device tree"); exit(1); } =20 diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c index 9c77183006..9b6f534532 100644 --- a/hw/ppc/sam460ex.c +++ b/hw/ppc/sam460ex.c @@ -234,7 +234,7 @@ static int sam460ex_load_uboot(void) if (!pflash_cfi01_register(base, NULL, "sam460ex.flash", bios_size, blk, 64 * KiB, fl_sectors, 1, 0x89, 0x18, 0x0000, 0x0, 1)) { - error_report("qemu: Error registering flash memory."); + error_report("Error registering flash memory"); /* XXX: return an error instead? */ exit(1); } @@ -552,7 +552,7 @@ static void sam460ex_init(MachineState *machine) if (!machine->kernel_filename) { success =3D sam460ex_load_uboot(); if (success < 0) { - error_report("qemu: could not load firmware"); + error_report("could not load firmware"); exit(1); } } @@ -571,7 +571,7 @@ static void sam460ex_init(MachineState *machine) } /* XXX try again as binary */ if (success < 0) { - error_report("qemu: could not load kernel '%s'", + error_report("could not load kernel '%s'", machine->kernel_filename); exit(1); } @@ -583,7 +583,7 @@ static void sam460ex_init(MachineState *machine) RAMDISK_ADDR, machine->ram_size - RAMDISK_ADDR= ); if (initrd_size < 0) { - error_report("qemu: could not load ram disk '%s' at %x", + error_report("could not load ram disk '%s' at %x", machine->initrd_filename, RAMDISK_ADDR); exit(1); } diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c index 4577d72037..cb513cc3bb 100644 --- a/hw/riscv/sifive_e.c +++ b/hw/riscv/sifive_e.c @@ -81,7 +81,7 @@ static uint64_t load_kernel(const char *kernel_filename) if (load_elf(kernel_filename, NULL, NULL, &kernel_entry, NULL, &kernel_high, 0, EM_RISCV, 1, 0) < 0) { - error_report("qemu: could not load kernel '%s'", kernel_filename); + error_report("could not load kernel '%s'", kernel_filename); exit(1); } return kernel_entry; diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index 59ae1ce24a..862f8ff5f7 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -72,7 +72,7 @@ static uint64_t load_kernel(const char *kernel_filename) if (load_elf(kernel_filename, NULL, NULL, &kernel_entry, NULL, &kernel_high, 0, EM_RISCV, 1, 0) < 0) { - error_report("qemu: could not load kernel '%s'", kernel_filename); + error_report("could not load kernel '%s'", kernel_filename); exit(1); } return kernel_entry; diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c index c8c056c50b..f0bf0d5d67 100644 --- a/hw/riscv/spike.c +++ b/hw/riscv/spike.c @@ -60,7 +60,7 @@ static uint64_t load_kernel(const char *kernel_filename) if (load_elf_ram_sym(kernel_filename, NULL, NULL, &kernel_entry, NULL, &kernel_high, 0, EM_RISCV, 1, 0, NULL, true, htif_symbol_callback) < 0) { - error_report("qemu: could not load kernel '%s'", kernel_filename); + error_report("could not load kernel '%s'", kernel_filename); exit(1); } return kernel_entry; diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 248bbdffd3..818a537844 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -64,7 +64,7 @@ static uint64_t load_kernel(const char *kernel_filename) if (load_elf(kernel_filename, NULL, NULL, &kernel_entry, NULL, &kernel_high, 0, EM_RISCV, 1, 0) < 0) { - error_report("qemu: could not load kernel '%s'", kernel_filename); + error_report("could not load kernel '%s'", kernel_filename); exit(1); } return kernel_entry; @@ -91,7 +91,7 @@ static hwaddr load_initrd(const char *filename, uint64_t = mem_size, if (size =3D=3D -1) { size =3D load_image_targphys(filename, *start, mem_size - *start); if (size =3D=3D -1) { - error_report("qemu: could not load ramdisk '%s'", filename); + error_report("could not load ramdisk '%s'", filename); exit(1); } } --=20 2.17.1