david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop "qemu:" prefix from error_report() arguments

Browse Source 
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>
This commit is contained in:
Mao Zhongyi 2018-09-20 22:05:30 -04:00 committed by Markus Armbruster
parent c6c594596e
commit 371b74e221
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/i386/multiboot.c
View File

@ -181,12 +181,12 @@ int load_multiboot(FWCfgState *fw_cfg,
if (!is_multiboot) if (!is_multiboot)
return 0; /* no 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(bootinfo, 0, sizeof(bootinfo));
memset(&mbs, 0, sizeof(mbs)); memset(&mbs, 0, sizeof(mbs));
if (flags & 0x00000004) { /* MULTIBOOT_HEADER_HAS_VBE */ 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 */ if (!(flags & 0x00010000)) { /* MULTIBOOT_HEADER_HAS_ADDR */
uint64_t elf_entry; uint64_t elf_entry;
@ -216,7 +216,7 @@ int load_multiboot(FWCfgState *fw_cfg,
exit(1); exit(1);
} }
mb_debug("qemu: loading multiboot-elf kernel " mb_debug("loading multiboot-elf kernel "
"(%#x bytes) with entry %#zx", "(%#x bytes) with entry %#zx",
mb_kernel_size, (size_t)mh_entry_addr); mb_kernel_size, (size_t)mh_entry_addr);
} else { } else {
@ -270,7 +270,7 @@ int load_multiboot(FWCfgState *fw_cfg,
mb_debug("multiboot: load_addr = %#x", mh_load_addr); mb_debug("multiboot: load_addr = %#x", mh_load_addr);
mb_debug("multiboot: load_end_addr = %#x", mh_load_end_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("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); mb_load_size, mh_load_addr);
mbs.mb_buf = g_malloc(mb_kernel_size); mbs.mb_buf = g_malloc(mb_kernel_size);

4
hw/ppc/e500.c
View File

@ -1000,7 +1000,7 @@ void ppce500_init(MachineState *machine)
payload_size = load_uimage(filename, &bios_entry, &loadaddr, NULL, payload_size = load_uimage(filename, &bios_entry, &loadaddr, NULL,
NULL, NULL); NULL, NULL);
if (payload_size < 0) { if (payload_size < 0) {
error_report("qemu: could not load firmware '%s'", filename); error_report("could not load firmware '%s'", filename);
exit(1); exit(1);
} }
} }
@ -1056,7 +1056,7 @@ void ppce500_init(MachineState *machine)
*/ */
dt_base = (loadaddr + payload_size + DTC_LOAD_PAD) & ~DTC_PAD_MASK; dt_base = (loadaddr + payload_size + DTC_LOAD_PAD) & ~DTC_PAD_MASK;
if (dt_base + DTB_MAX_SIZE > ram_size) { 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); exit(1);
} }

8
hw/ppc/sam460ex.c
View File

@ -234,7 +234,7 @@ static int sam460ex_load_uboot(void)
if (!pflash_cfi01_register(base, NULL, "sam460ex.flash", bios_size, if (!pflash_cfi01_register(base, NULL, "sam460ex.flash", bios_size,
blk, 64 * KiB, fl_sectors, blk, 64 * KiB, fl_sectors,
1, 0x89, 0x18, 0x0000, 0x0, 1)) { 1, 0x89, 0x18, 0x0000, 0x0, 1)) {
error_report("qemu: Error registering flash memory."); error_report("Error registering flash memory");
/* XXX: return an error instead? */ /* XXX: return an error instead? */
exit(1); exit(1);
} }
@ -552,7 +552,7 @@ static void sam460ex_init(MachineState *machine)
if (!machine->kernel_filename) { if (!machine->kernel_filename) {
success = sam460ex_load_uboot(); success = sam460ex_load_uboot();
if (success < 0) { if (success < 0) {
error_report("qemu: could not load firmware"); error_report("could not load firmware");
exit(1); exit(1);
} }
} }
@ -571,7 +571,7 @@ static void sam460ex_init(MachineState *machine)
} }
/* XXX try again as binary */ /* XXX try again as binary */
if (success < 0) { if (success < 0) {
error_report("qemu: could not load kernel '%s'", error_report("could not load kernel '%s'",
machine->kernel_filename); machine->kernel_filename);
exit(1); exit(1);
} }
@ -583,7 +583,7 @@ static void sam460ex_init(MachineState *machine)
RAMDISK_ADDR, RAMDISK_ADDR,
machine->ram_size - RAMDISK_ADDR); machine->ram_size - RAMDISK_ADDR);
if (initrd_size < 0) { 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); machine->initrd_filename, RAMDISK_ADDR);
exit(1); exit(1);
} }

2
hw/riscv/sifive_e.c
View File

@ -81,7 +81,7 @@ static uint64_t load_kernel(const char *kernel_filename)
if (load_elf(kernel_filename, NULL, NULL, if (load_elf(kernel_filename, NULL, NULL,
&kernel_entry, NULL, &kernel_high, &kernel_entry, NULL, &kernel_high,
0, EM_RISCV, 1, 0) < 0) { 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); exit(1);
} }
return kernel_entry; return kernel_entry;

2
hw/riscv/sifive_u.c
View File

@ -72,7 +72,7 @@ static uint64_t load_kernel(const char *kernel_filename)
if (load_elf(kernel_filename, NULL, NULL, if (load_elf(kernel_filename, NULL, NULL,
&kernel_entry, NULL, &kernel_high, &kernel_entry, NULL, &kernel_high,
0, EM_RISCV, 1, 0) < 0) { 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); exit(1);
} }
return kernel_entry; return kernel_entry;

2
hw/riscv/spike.c
View File

@ -60,7 +60,7 @@ static uint64_t load_kernel(const char *kernel_filename)
if (load_elf_ram_sym(kernel_filename, NULL, NULL, if (load_elf_ram_sym(kernel_filename, NULL, NULL,
&kernel_entry, NULL, &kernel_high, 0, EM_RISCV, 1, 0, &kernel_entry, NULL, &kernel_high, 0, EM_RISCV, 1, 0,
NULL, true, htif_symbol_callback) < 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); exit(1);
} }
return kernel_entry; return kernel_entry;

4
hw/riscv/virt.c
View File

@ -64,7 +64,7 @@ static uint64_t load_kernel(const char *kernel_filename)
if (load_elf(kernel_filename, NULL, NULL, if (load_elf(kernel_filename, NULL, NULL,
&kernel_entry, NULL, &kernel_high, &kernel_entry, NULL, &kernel_high,
0, EM_RISCV, 1, 0) < 0) { 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); exit(1);
} }
return kernel_entry; return kernel_entry;
@ -91,7 +91,7 @@ static hwaddr load_initrd(const char *filename, uint64_t mem_size,
if (size == -1) { if (size == -1) {
size = load_image_targphys(filename, *start, mem_size - *start); size = load_image_targphys(filename, *start, mem_size - *start);
if (size == -1) { if (size == -1) {
error_report("qemu: could not load ramdisk '%s'", filename); error_report("could not load ramdisk '%s'", filename);
exit(1); exit(1);
} }
} }