Commit 371b74e2 authored Sep 20, 2018 by Mao Zhongyi Committed by Markus Armbruster Sep 24, 2018

Drop "qemu:" prefix from error_report() arguments



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 <thuth@redhat.com>
Signed-off-by: Mao Zhongyi <maozhongyi@cmss.chinamobile.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <1537495530-580-1-git-send-email-maozhongyi@cmss.chinamobile.com>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Markus Armbruster <armbru@redhat.com>

parent c6c59459

hw/i386/multiboot.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -181,12 +181,12 @@ int load_multiboot(FWCfgState *fw_cfg,
		if (!is_multiboot)
		return 0; /* no multiboot */

		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));

		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);
		}

		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 = %#x", mh_load_addr);
		mb_debug("multiboot: load_end_addr = %#x", mh_load_end_addr);
		mb_debug("multiboot: bss_end_addr = %#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);

		mbs.mb_buf = g_malloc(mb_kernel_size);

hw/ppc/e500.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1000,7 +1000,7 @@ void ppce500_init(MachineState *machine)
		payload_size = load_uimage(filename, &bios_entry, &loadaddr, NULL,
		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 = (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);
		}

hw/ppc/sam460ex.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -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 = 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);
		}

hw/riscv/sifive_e.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

hw/riscv/sifive_u.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;