diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-09-25 11:37:39 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-09-25 11:37:39 +0100 |
| commit | 2f831d04985f064e9306fa58db516e0a3e1df918 (patch) | |
| tree | 428980441c2b8a0acccf8dd7a6909cc255c761e8 /hw/ppc | |
| parent | 8ca19bd882997b69cd9c37adabbfe8360a0a83ee (diff) | |
| parent | c468e368e102e8bb93cbbf1c3daa0c04d361d3c4 (diff) | |
| download | focaccia-qemu-2f831d04985f064e9306fa58db516e0a3e1df918.tar.gz focaccia-qemu-2f831d04985f064e9306fa58db516e0a3e1df918.zip | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2018-09-24' into staging
Error reporting & miscellaneous patches for 2018-09-24
# gpg: Signature made Mon 24 Sep 2018 16:16:50 BST
# gpg: using RSA key 3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-error-2018-09-24:
MAINTAINERS: Fix F: patterns that don't match anything
Drop "qemu:" prefix from error_report() arguments
qemu-error: make use of {error, warn}_report_once_cond
qemu-error: add {error, warn}_report_once_cond
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
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 7d19b1498c..e6747fce28 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 250fb86795..5aac58f36e 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); } @@ -545,7 +545,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); } } @@ -564,7 +564,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); } @@ -576,7 +576,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); } |