Commit 2a8b5870 authored by Dmitry Osipenko's avatar Dmitry Osipenko Committed by Peter Maydell
Browse files

hw/ptimer: Suppress error messages under qtest 



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: default avatarDmitry Osipenko <digetx@gmail.com>
Message-id: 44877fff4ff03205590698d3dc189ad6d091472f.1473252818.git.digetx@gmail.com
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent e7ea81c3

hw/core/ptimer.c

+7 −2
Original line number Diff line number Diff line
@@ -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) {

        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) {

        if (!qtest_enabled()) {

            fprintf(stderr, "Timer with period zero, disabling\n");

        }

        return;

    }

    s->enabled = oneshot ? 2 : 1;