diff options
| author | Mao Zhongyi <maozhongyi@cmss.chinamobile.com> | 2018-09-20 22:05:30 -0400 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2018-09-24 17:13:07 +0200 |
| commit | 371b74e2215fde31cc22d23dfa710e11bb906038 (patch) | |
| tree | 87d35b5528eae27f7e212674e764aed67a07fa37 /hw/ppc | |
| parent | c6c594596eabc80f6e54d96c56f01f8531d389b5 (diff) | |
| download | qemu-371b74e2215fde31cc22d23dfa710e11bb906038.zip qemu-371b74e2215fde31cc22d23dfa710e11bb906038.tar.gz qemu-371b74e2215fde31cc22d23dfa710e11bb906038.tar.bz2 | |
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>
Diffstat (limited to 'hw/ppc')
| -rw-r--r-- | hw/ppc/e500.c | 4 | ||||
| -rw-r--r-- | hw/ppc/sam460ex.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index 7d19b14..e6747fc 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -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); } diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c index 9c77183..9b6f534 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 = 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); } |