diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-02-06 14:21:40 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-02-06 14:21:41 +0000 |
| commit | 20e0d439a6ded635ec89f6135c08cd5541c68962 (patch) | |
| tree | d0aa6765c85d66876f3719276f46878dd065efb5 /hw | |
| parent | 2b3805f370521deacab974b9c9ca07d2319a8890 (diff) | |
| parent | edf90bd0af98bf03ec1e60e5c7632774f62837d8 (diff) | |
Merge remote-tracking branch 'remotes/rth/tags/pull-hppa-20180204' into staging
hppa-softmmu update
# gpg: Signature made Sun 04 Feb 2018 22:20:40 GMT
# gpg: using RSA key 64DF38E8AF7E215F
# gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>"
# Primary key fingerprint: 7A48 1E78 868B 4DB6 A85A 05C0 64DF 38E8 AF7E 215F
* remotes/rth/tags/pull-hppa-20180204:
roms/seabios-hppa: Update submodule and image
tests: Enable boot-serial-test for hppa
hw/hppa: Use qemu_log_mask instead of fprintf to stderr
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/hppa/machine.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index afd3867313..19033e268d 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -19,6 +19,7 @@ #include "hw/hppa/hppa_sys.h" #include "qemu/cutils.h" #include "qapi/error.h" +#include "qemu/log.h" #define MAX_IDE_BUS 2 @@ -111,7 +112,6 @@ static void machine_hppa_init(MachineState *machine) uint32_t addr = DINO_UART_HPA + 0x800; serial_mm_init(addr_space, addr, 0, serial_irq, 115200, serial_hds[0], DEVICE_BIG_ENDIAN); - fprintf(stderr, "Serial port created at 0x%x\n", addr); } /* SCSI disk setup. */ @@ -146,9 +146,9 @@ static void machine_hppa_init(MachineState *machine) error_report("could not load firmware '%s'", firmware_filename); exit(1); } - fprintf(stderr, "Firmware loaded at 0x%08" PRIx64 "-0x%08" PRIx64 - ", entry at 0x%08" PRIx64 ".\n", - firmware_low, firmware_high, firmware_entry); + qemu_log_mask(CPU_LOG_PAGE, "Firmware loaded at 0x%08" PRIx64 + "-0x%08" PRIx64 ", entry at 0x%08" PRIx64 ".\n", + firmware_low, firmware_high, firmware_entry); if (firmware_low < ram_size || firmware_high >= FIRMWARE_END) { error_report("Firmware overlaps with memory or IO space"); exit(1); @@ -163,7 +163,6 @@ static void machine_hppa_init(MachineState *machine) /* Load kernel */ if (kernel_filename) { - fprintf(stderr, "LOADING kernel '%s'\n", kernel_filename); size = load_elf(kernel_filename, &cpu_hppa_to_phys, NULL, &kernel_entry, &kernel_low, &kernel_high, true, EM_PARISC, 0, 0); @@ -177,10 +176,10 @@ static void machine_hppa_init(MachineState *machine) error_report("could not load kernel '%s'", kernel_filename); exit(1); } - - fprintf(stderr, "Kernel loaded at 0x%08" PRIx64 "-0x%08" PRIx64 - ", entry at 0x%08" PRIx64 ", size %ld kB.\n", - kernel_low, kernel_high, kernel_entry, size / 1024); + qemu_log_mask(CPU_LOG_PAGE, "Kernel loaded at 0x%08" PRIx64 + "-0x%08" PRIx64 ", entry at 0x%08" PRIx64 + ", size %ld kB.\n", + kernel_low, kernel_high, kernel_entry, size / 1024); if (kernel_cmdline) { cpu[0]->env.gr[24] = 0x4000; |