diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2017-10-16 18:29:38 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2017-10-16 18:29:38 +0100 |
commit | e24cdd07216890d24468cdcbdd5a3e60b3e9f23b (patch) | |
tree | d6d3181b72eeee66cebd40f1f23da623a37421fe /hw/m68k/an5206.c | |
parent | c5bbcaa4b7c0f8a322bebe9ec563560178a68b55 (diff) | |
parent | 03bf6b5c08c792f5c2b55d6038e9a6acbf43d9c3 (diff) | |
download | qemu-e24cdd07216890d24468cdcbdd5a3e60b3e9f23b.tar.gz |
Merge remote-tracking branch 'remotes/huth/tags/pull-request-2017-10-16' into staging
Some m68k, qtest and config improvements
# gpg: Signature made Mon 16 Oct 2017 13:38:03 BST
# gpg: using RSA key 0x2ED9D774FE702DB5
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>"
# gpg: aka "Thomas Huth <thuth@redhat.com>"
# gpg: aka "Thomas Huth <huth@tuxfamily.org>"
# gpg: aka "Thomas Huth <th.huth@posteo.de>"
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5
* remotes/huth/tags/pull-request-2017-10-16:
default-configs: Enable CONFIG_VMXNET3_PCI only on x86
tests/prom-env: Bump the timeout, and test pseries only in slow mode
tests: use g_new() family of functions
M68K: use g_new() family of functions
hw/m68k: Replace fprintf(stderr, "*\n" with error_report()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/m68k/an5206.c')
-rw-r--r-- | hw/m68k/an5206.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/m68k/an5206.c b/hw/m68k/an5206.c index 9002c460e5..db634cbe89 100644 --- a/hw/m68k/an5206.c +++ b/hw/m68k/an5206.c @@ -66,7 +66,7 @@ static void an5206_init(MachineState *machine) if (qtest_enabled()) { return; } - fprintf(stderr, "Kernel image must be specified\n"); + error_report("Kernel image must be specified"); exit(1); } @@ -83,7 +83,7 @@ static void an5206_init(MachineState *machine) entry = KERNEL_LOAD_ADDR; } if (kernel_size < 0) { - fprintf(stderr, "qemu: could not load kernel '%s'\n", kernel_filename); + error_report("Could not load kernel '%s'", kernel_filename); exit(1); } |