[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 18/36] hw/ptimer: Suppress error messages under qtest
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 18/36] hw/ptimer: Suppress error messages under qtest |
Date: |
Thu, 22 Sep 2016 18:21:57 +0100 |
From: Dmitry Osipenko <address@hidden>
Under qtest ptimer emits lots of warning messages. The messages are caused
by the actual checking of the ptimer error conditions. Suppress those
messages, so they do not distract.
Signed-off-by: Dmitry Osipenko <address@hidden>
Message-id: address@hidden
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>
---
hw/core/ptimer.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/hw/core/ptimer.c b/hw/core/ptimer.c
index 00fdf15..c45c835 100644
--- a/hw/core/ptimer.c
+++ b/hw/core/ptimer.c
@@ -11,6 +11,7 @@
#include "hw/ptimer.h"
#include "qemu/host-utils.h"
#include "sysemu/replay.h"
+#include "sysemu/qtest.h"
struct ptimer_state
{
@@ -44,7 +45,9 @@ static void ptimer_reload(ptimer_state *s)
s->delta = s->limit;
}
if (s->delta == 0 || s->period == 0) {
- fprintf(stderr, "Timer with period zero, disabling\n");
+ if (!qtest_enabled()) {
+ fprintf(stderr, "Timer with period zero, disabling\n");
+ }
timer_del(s->timer);
s->enabled = 0;
return;
@@ -163,7 +166,9 @@ void ptimer_run(ptimer_state *s, int oneshot)
bool was_disabled = !s->enabled;
if (was_disabled && s->period == 0) {
- fprintf(stderr, "Timer with period zero, disabling\n");
+ if (!qtest_enabled()) {
+ fprintf(stderr, "Timer with period zero, disabling\n");
+ }
return;
}
s->enabled = oneshot ? 2 : 1;
--
2.7.4
- [Qemu-devel] [PULL 00/36] target-arm queue, Peter Maydell, 2016/09/22
- [Qemu-devel] [PULL 13/36] aspeed: use error_report instead of LOG_GUEST_ERROR, Peter Maydell, 2016/09/22
- [Qemu-devel] [PULL 10/36] arm: add support for an ast2500 evaluation board, Peter Maydell, 2016/09/22
- [Qemu-devel] [PULL 12/36] aspeed: calculate the RAM size bits at realize time, Peter Maydell, 2016/09/22
- [Qemu-devel] [PULL 16/36] hw/ptimer: Actually stop the timer in case of error, Peter Maydell, 2016/09/22
- [Qemu-devel] [PULL 07/36] palmetto-bmc: add board specific configuration, Peter Maydell, 2016/09/22
- [Qemu-devel] [PULL 08/36] hw/misc: use macros to define hw-strap1 register on the AST2400 Aspeed SoC, Peter Maydell, 2016/09/22
- [Qemu-devel] [PULL 18/36] hw/ptimer: Suppress error messages under qtest,
Peter Maydell <=
- [Qemu-devel] [PULL 03/36] ast2400: replace ast2400 with aspeed_soc, Peter Maydell, 2016/09/22
- [Qemu-devel] [PULL 15/36] aspeed: allocate RAM after the memory controller has checked the size, Peter Maydell, 2016/09/22
- [Qemu-devel] [PULL 09/36] aspeed: add a ast2500 SoC and support to the SCU and SDMC controllers, Peter Maydell, 2016/09/22
- [Qemu-devel] [PULL 22/36] cadence_gem: Add support for screening, Peter Maydell, 2016/09/22
- [Qemu-devel] [PULL 25/36] xlnx-zynqmp: Set the number of priority queues, Peter Maydell, 2016/09/22
- [Qemu-devel] [PULL 11/36] palmetto-bmc: remove extra no_sdcard assignement, Peter Maydell, 2016/09/22
- [Qemu-devel] [PULL 14/36] aspeed: add a ram_size property to the memory controller, Peter Maydell, 2016/09/22
- [Qemu-devel] [PULL 21/36] cadence_gem: Add the num-priority-queues property, Peter Maydell, 2016/09/22
- [Qemu-devel] [PULL 27/36] loader: Use the specified MemoryRegion, Peter Maydell, 2016/09/22
- [Qemu-devel] [PULL 02/36] ast2400: rename the Aspeed SoC files to aspeed_soc, Peter Maydell, 2016/09/22