xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2025-02-17 10:38:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mc146818rtc: ensure LOST_TICK_POLICY_SLEW is only enabled on TARGET_I386

Browse Source 
Any tick policy specified on other platforms rather on TARGET_I386
will fall back to LOST_TICK_POLICY_DISCARD silently, this patch makes
sure only TARGET_I386 can enable LOST_TICK_POLICY_SLEW

After that, we can enable LOST_TICK_POLICY_SLEW in the common code
which need not use '#ifdef TARGET_I386' to make these code be x86
specific anymore

Signed-off-by: Xiao Guangrong <xiaoguangrong@tencent.com>
Message-Id: <20170510083259.3900-4-xiaoguangrong@tencent.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Xiao Guangrong 2017-05-10 16:32:57 +08:00 committed by Paolo Bonzini
parent 369b41359a
commit 4aa70a0e9c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/timer/mc146818rtc.c
View File

@ -974,19 +974,19 @@ static void rtc_realizefn(DeviceState *dev, Error **errp)
rtc_set_date_from_host(isadev); rtc_set_date_from_host(isadev);
#ifdef TARGET_I386
switch (s->lost_tick_policy) { switch (s->lost_tick_policy) {
#ifdef TARGET_I386
case LOST_TICK_POLICY_SLEW: case LOST_TICK_POLICY_SLEW:
s->coalesced_timer = s->coalesced_timer =
timer_new_ns(rtc_clock, rtc_coalesced_timer, s); timer_new_ns(rtc_clock, rtc_coalesced_timer, s);
break; break;
#endif
case LOST_TICK_POLICY_DISCARD: case LOST_TICK_POLICY_DISCARD:
break; break;
default: default:
error_setg(errp, "Invalid lost tick policy."); error_setg(errp, "Invalid lost tick policy.");
return; return;
} }
#endif
s->periodic_timer = timer_new_ns(rtc_clock, rtc_periodic_timer, s); s->periodic_timer = timer_new_ns(rtc_clock, rtc_periodic_timer, s);
s->update_timer = timer_new_ns(rtc_clock, rtc_update_timer, s); s->update_timer = timer_new_ns(rtc_clock, rtc_update_timer, s);