diff mbox

[PULL,v5,39/43] hw/hppa: Implement DINO system board

Message ID 20180201201101.GA31191@ls3530.fritz.box (mailing list archive)
State New, archived
Headers show

Commit Message

Helge Deller Feb. 1, 2018, 8:11 p.m. UTC 
* Thomas Huth <thuth@redhat.com>:
> First kudos for the new hppa-softmmu target!

Thanks Thomas!

> But these debug messages now pop up during "make check-qtest":
> 
> Serial port created at 0xfff83800
> Firmware loaded at 0xf0000000-0xf0023f29, entry at 0xf0000084.
> 
> That's a little bit annoying. Could you please either remove them or
> silence them in qtest mode by adding a check for !qtest_enabled() ?

The patch below fixes it.
Richard, can you apply it?

Helge

-------

target/hppa: Silence debug messages in qtest mode

Reported-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Helge Deller <deller@gmx.de>
diff mbox

Patch

diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
index afd3867313..338aa87724 100644
--- a/hw/hppa/machine.c
+++ b/hw/hppa/machine.c
@@ -12,6 +12,7 @@ 
 #include "hw/boards.h"
 #include "qemu/error-report.h"
 #include "sysemu/sysemu.h"
+#include "sysemu/qtest.h"
 #include "hw/timer/mc146818rtc.h"
 #include "hw/ide.h"
 #include "hw/timer/i8254.h"
@@ -111,7 +112,9 @@  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);
+        if (!qtest_enabled()) {
+            fprintf(stderr, "Serial port created at 0x%x\n", addr);
+        }
     }
 
     /* SCSI disk setup. */
@@ -146,9 +149,11 @@  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
+    if (!qtest_enabled()) {
+        fprintf(stderr, "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);