diff mbox

[v3,3/5] mc146818rtc: ensure LOST_TICK_POLICY_SLEW is only enabled on TARGET_I386

Message ID 20170510083259.3900-4-xiaoguangrong@tencent.com
State New
Headers show

Commit Message

Xiao Guangrong May 10, 2017, 8:32 a.m. UTC 
From: Xiao Guangrong <xiaoguangrong@tencent.com>

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>
---
 hw/timer/mc146818rtc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Philippe Mathieu-Daudé May 13, 2017, 10:13 p.m. UTC | #1 
On 05/10/2017 05:32 AM, guangrong.xiao@gmail.com wrote:
> From: Xiao Guangrong <xiaoguangrong@tencent.com>
>
> 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>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> ---
>  hw/timer/mc146818rtc.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c
> index dac6744..9810bd5 100644
> --- a/hw/timer/mc146818rtc.c
> +++ b/hw/timer/mc146818rtc.c
> @@ -980,19 +980,19 @@ static void rtc_realizefn(DeviceState *dev, Error **errp)
>
>      rtc_set_date_from_host(isadev);
>
> -#ifdef TARGET_I386
>      switch (s->lost_tick_policy) {
> +#ifdef TARGET_I386
>      case LOST_TICK_POLICY_SLEW:
>          s->coalesced_timer =
>              timer_new_ns(rtc_clock, rtc_coalesced_timer, s);
>          break;
> +#endif
>      case LOST_TICK_POLICY_DISCARD:
>          break;
>      default:
>          error_setg(errp, "Invalid lost tick policy.");
>          return;
>      }
> -#endif
>
>      s->periodic_timer = timer_new_ns(rtc_clock, rtc_periodic_timer, s);
>      s->update_timer = timer_new_ns(rtc_clock, rtc_update_timer, s);
>
diff mbox

Patch

diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c
index dac6744..9810bd5 100644
--- a/hw/timer/mc146818rtc.c
+++ b/hw/timer/mc146818rtc.c
@@ -980,19 +980,19 @@  static void rtc_realizefn(DeviceState *dev, Error **errp)
 
     rtc_set_date_from_host(isadev);
 
-#ifdef TARGET_I386
     switch (s->lost_tick_policy) {
+#ifdef TARGET_I386
     case LOST_TICK_POLICY_SLEW:
         s->coalesced_timer =
             timer_new_ns(rtc_clock, rtc_coalesced_timer, s);
         break;
+#endif
     case LOST_TICK_POLICY_DISCARD:
         break;
     default:
         error_setg(errp, "Invalid lost tick policy.");
         return;
     }
-#endif
 
     s->periodic_timer = timer_new_ns(rtc_clock, rtc_periodic_timer, s);
     s->update_timer = timer_new_ns(rtc_clock, rtc_update_timer, s);