aboutsummaryrefslogtreecommitdiff
path: root/hw/rtc/mc146818rtc.c
diff options
context:
space:
mode:
authorThomas Huth <thuth@redhat.com>2023-01-10 10:53:48 +0100
committerPhilippe Mathieu-Daudé <philmd@linaro.org>2023-01-13 16:22:57 +0100
commit2b85e0cda4b066010efda63a2d2359872ba07a04 (patch)
tree9ce84374c3df2fb86a17e8a2d8362c03a9d7c047 /hw/rtc/mc146818rtc.c
parent2aaf0ec7ff239523ce2c8d913b120202c219af3e (diff)
hw/intc: Extract the IRQ counting functions into a separate file
These IRQ counting functions will soon be required in binaries that do not include the APIC code, too, so let's extract them into a separate file that can be linked independently of the APIC code. While we're at it, change the apic_* prefix into kvm_* since the functions are used from the i8259 PIC (i.e. not the APIC), too. Reviewed-by: Bernhard Beschow <shentey@gmail.com> Signed-off-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Message-Id: <20230110095351.611724-2-thuth@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Diffstat (limited to 'hw/rtc/mc146818rtc.c')
-rw-r--r--hw/rtc/mc146818rtc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c
index 1ebb412479..947d68c257 100644
--- a/hw/rtc/mc146818rtc.c
+++ b/hw/rtc/mc146818rtc.c
@@ -27,6 +27,7 @@
#include "qemu/module.h"
#include "qemu/bcd.h"
#include "hw/acpi/acpi_aml_interface.h"
+#include "hw/intc/kvm_irqcount.h"
#include "hw/irq.h"
#include "hw/qdev-properties.h"
#include "hw/qdev-properties-system.h"
@@ -46,7 +47,6 @@
#ifdef TARGET_I386
#include "qapi/qapi-commands-misc-target.h"
-#include "hw/i386/apic.h"
#endif
//#define DEBUG_CMOS
@@ -124,9 +124,9 @@ void qmp_rtc_reset_reinjection(Error **errp)
static bool rtc_policy_slew_deliver_irq(RTCState *s)
{
- apic_reset_irq_delivered();
+ kvm_reset_irq_delivered();
qemu_irq_raise(s->irq);
- return apic_get_irq_delivered();
+ return kvm_get_irq_delivered();
}
static void rtc_coalesced_timer(void *opaque)