Revision e332340a

b/vl.c
915 915

  
916 916
static inline int alarm_has_dynticks(struct qemu_alarm_timer *t)
917 917
{
918
    return t->flags & ALARM_FLAG_DYNTICKS;
918
    return t && (t->flags & ALARM_FLAG_DYNTICKS);
919 919
}
920 920

  
921 921
static void qemu_rearm_alarm_timer(struct qemu_alarm_timer *t)
......
1349 1349
        qemu_timer_expired(active_timers[QEMU_TIMER_REALTIME],
1350 1350
                           qemu_get_clock(rt_clock))) {
1351 1351
        qemu_event_increment();
1352
        alarm_timer->flags |= ALARM_FLAG_EXPIRED;
1352
        if (alarm_timer) alarm_timer->flags |= ALARM_FLAG_EXPIRED;
1353 1353

  
1354 1354
#ifndef CONFIG_IOTHREAD
1355 1355
        if (next_cpu) {

Also available in: Unified diff