util/timer: fix -Werror=maybe-uninitialized false-positive
../util/qemu-timer.c:198:24: error: ‘expire_time’ may be used uninitialized [-Werror=maybe-uninitialized] ../util/qemu-timer.c:476:8: error: ‘rearm’ may be used uninitialized [-Werror=maybe-uninitialized] Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
This commit is contained in:
parent
25bc7d16fa
commit
5491295fa5
@ -182,7 +182,7 @@ bool qemu_clock_has_timers(QEMUClockType type)
|
|||||||
|
|
||||||
bool timerlist_expired(QEMUTimerList *timer_list)
|
bool timerlist_expired(QEMUTimerList *timer_list)
|
||||||
{
|
{
|
||||||
int64_t expire_time;
|
int64_t expire_time = 0;
|
||||||
|
|
||||||
if (!qatomic_read(&timer_list->active_timers)) {
|
if (!qatomic_read(&timer_list->active_timers)) {
|
||||||
return false;
|
return false;
|
||||||
@ -212,7 +212,7 @@ bool qemu_clock_expired(QEMUClockType type)
|
|||||||
int64_t timerlist_deadline_ns(QEMUTimerList *timer_list)
|
int64_t timerlist_deadline_ns(QEMUTimerList *timer_list)
|
||||||
{
|
{
|
||||||
int64_t delta;
|
int64_t delta;
|
||||||
int64_t expire_time;
|
int64_t expire_time = 0;
|
||||||
|
|
||||||
if (!qatomic_read(&timer_list->active_timers)) {
|
if (!qatomic_read(&timer_list->active_timers)) {
|
||||||
return -1;
|
return -1;
|
||||||
@ -461,7 +461,7 @@ void timer_mod_ns(QEMUTimer *ts, int64_t expire_time)
|
|||||||
void timer_mod_anticipate_ns(QEMUTimer *ts, int64_t expire_time)
|
void timer_mod_anticipate_ns(QEMUTimer *ts, int64_t expire_time)
|
||||||
{
|
{
|
||||||
QEMUTimerList *timer_list = ts->timer_list;
|
QEMUTimerList *timer_list = ts->timer_list;
|
||||||
bool rearm;
|
bool rearm = false;
|
||||||
|
|
||||||
WITH_QEMU_LOCK_GUARD(&timer_list->active_timers_lock) {
|
WITH_QEMU_LOCK_GUARD(&timer_list->active_timers_lock) {
|
||||||
if (ts->expire_time == -1 || ts->expire_time > expire_time) {
|
if (ts->expire_time == -1 || ts->expire_time > expire_time) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user