On Tue, Jan 3, 2023 at 9:48 AM Thomas Huth <th...@redhat.com> wrote:
> The only reason for this code being target dependent was the IRQ-counting
> related code in rtc_policy_slew_deliver_irq(). Since these functions have
> been moved into a new, separate file (kvm_irqcount.c) which is now always
> compiled and linked if either APIC or the mc146818 device are required,
>
I think you don't need to mention the APIC here since this patch doesn't
touch it and since kvm_irqcount.c is also compiled if the i8259 is
required. Anyway:
Reviewed-by: Bernhard Beschow <shen...@gmail.com>
> and since we've got a new mechanism for deciding whether the slew tick
> policy is available now (via the "slew-tick-policy-available" property),
> we can get rid of the #ifdef TARGET_I386 switches in mc146818rtc.c and
> declare it in the softmmu_ss instead of specific_ss, so that the code only
> gets compiled once for all targets.
>
> Signed-off-by: Thomas Huth <th...@redhat.com>
> ---
> include/hw/rtc/mc146818rtc.h | 1 +
> hw/rtc/mc146818rtc.c | 15 +--------------
> hw/rtc/meson.build | 3 +--
> 3 files changed, 3 insertions(+), 16 deletions(-)
>
> diff --git a/include/hw/rtc/mc146818rtc.h b/include/hw/rtc/mc146818rtc.h
> index 54af63d091..9d15d70da8 100644
> --- a/include/hw/rtc/mc146818rtc.h
> +++ b/include/hw/rtc/mc146818rtc.h
> @@ -56,5 +56,6 @@ ISADevice *mc146818_rtc_init(ISABus *bus, int base_year,
> qemu_irq intercept_irq);
> void rtc_set_memory(ISADevice *dev, int addr, int val);
> int rtc_get_memory(ISADevice *dev, int addr);
> +void qmp_rtc_reset_reinjection(Error **errp);
>
> #endif /* HW_RTC_MC146818RTC_H */
> diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c
> index 86381a74c3..4497ddf024 100644
> --- a/hw/rtc/mc146818rtc.c
> +++ b/hw/rtc/mc146818rtc.c
> @@ -45,10 +45,6 @@
> #include "qapi/visitor.h"
> #include "hw/rtc/mc146818rtc_regs.h"
>
> -#ifdef TARGET_I386
> -#include "qapi/qapi-commands-misc-target.h"
> -#endif
> -
> //#define DEBUG_CMOS
> //#define DEBUG_COALESCED
>
> @@ -112,7 +108,6 @@ static void rtc_coalesced_timer_update(RTCState *s)
> static QLIST_HEAD(, RTCState) rtc_devices =
> QLIST_HEAD_INITIALIZER(rtc_devices);
>
> -#ifdef TARGET_I386
> void qmp_rtc_reset_reinjection(Error **errp)
> {
> RTCState *s;
> @@ -124,6 +119,7 @@ void qmp_rtc_reset_reinjection(Error **errp)
>
> static bool rtc_policy_slew_deliver_irq(RTCState *s)
> {
> + assert(s->slew_tick_policy_available);
> kvm_reset_irq_delivered();
> qemu_irq_raise(s->irq);
> return kvm_get_irq_delivered();
> @@ -145,13 +141,6 @@ static void rtc_coalesced_timer(void *opaque)
>
> rtc_coalesced_timer_update(s);
> }
> -#else
> -static bool rtc_policy_slew_deliver_irq(RTCState *s)
> -{
> - assert(0);
> - return false;
> -}
> -#endif
>
> static uint32_t rtc_periodic_clock_ticks(RTCState *s)
> {
> @@ -925,12 +914,10 @@ static void rtc_realizefn(DeviceState *dev, Error
> **errp)
> case LOST_TICK_POLICY_DISCARD:
> break;
> case LOST_TICK_POLICY_SLEW:
> -#ifdef TARGET_I386
> if (s->slew_tick_policy_available) {
> s->coalesced_timer = timer_new_ns(rtc_clock,
> rtc_coalesced_timer, s);
> break;
> }
> -#endif
> /* fallthrough */
> default:
> error_setg(errp, "Invalid lost tick policy.");
> diff --git a/hw/rtc/meson.build b/hw/rtc/meson.build
> index dc33973384..34a4d316fa 100644
> --- a/hw/rtc/meson.build
> +++ b/hw/rtc/meson.build
> @@ -13,5 +13,4 @@ softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true:
> files('aspeed_rtc.c'))
> softmmu_ss.add(when: 'CONFIG_GOLDFISH_RTC', if_true:
> files('goldfish_rtc.c'))
> softmmu_ss.add(when: 'CONFIG_LS7A_RTC', if_true: files('ls7a_rtc.c'))
> softmmu_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true:
> files('allwinner-rtc.c'))
> -
> -specific_ss.add(when: 'CONFIG_MC146818RTC', if_true:
> files('mc146818rtc.c'))
> +softmmu_ss.add(when: 'CONFIG_MC146818RTC', if_true:
> files('mc146818rtc.c'))
> --
> 2.31.1
>
>
