From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:34586) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QJKUo-0000uP-9o for qemu-devel@nongnu.org; Mon, 09 May 2011 03:03:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QJKUn-00040A-4k for qemu-devel@nongnu.org; Mon, 09 May 2011 03:03:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38836) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QJKUm-000401-Qi for qemu-devel@nongnu.org; Mon, 09 May 2011 03:03:09 -0400 From: Ulrich Obergfell Date: Mon, 9 May 2011 09:03:17 +0200 Message-Id: <1304924601-3848-2-git-send-email-uobergfe@redhat.com> In-Reply-To: <1304924601-3848-1-git-send-email-uobergfe@redhat.com> References: <1304924601-3848-1-git-send-email-uobergfe@redhat.com> Subject: [Qemu-devel] [PATCH v4 1/5] hpet 'driftfix': add hooks required to detect coalesced interrupts (x86 apic only) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, kvm@vger.kernel.org, jan.kiszka@siemens.com, mtosatti@redhat.com, uobergfe@redhat.com, gcosta@redhat.com, avi@redhat.com 'target_get_irq_delivered' and 'target_reset_irq_delivered' point to functions that are called by update_irq() to detect coalesced interrupts. Initially they point to stub functions which pretend successful interrupt injection. apic code calls two registration functions to replace the stubs with apic_get_irq_delivered() and apic_reset_irq_delivered(). This change can be replaced if a generic feedback infrastructure to track coalesced IRQs for periodic, clock providing devices becomes available. Signed-off-by: Ulrich Obergfell --- hw/apic.c | 4 ++++ hw/pc.h | 13 +++++++++++++ vl.c | 13 +++++++++++++ 3 files changed, 30 insertions(+), 0 deletions(-) diff --git a/hw/apic.c b/hw/apic.c index a45b57f..94b1d15 100644 --- a/hw/apic.c +++ b/hw/apic.c @@ -17,6 +17,7 @@ * License along with this library; if not, see */ #include "hw.h" +#include "pc.h" #include "apic.h" #include "ioapic.h" #include "qemu-timer.h" @@ -1143,6 +1144,9 @@ static SysBusDeviceInfo apic_info = { static void apic_register_devices(void) { + register_target_get_irq_delivered(apic_get_irq_delivered); + register_target_reset_irq_delivered(apic_reset_irq_delivered); + sysbus_register_withprop(&apic_info); } diff --git a/hw/pc.h b/hw/pc.h index 1291e2d..79885f4 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -7,6 +7,19 @@ #include "fdc.h" #include "net.h" +extern int (*target_get_irq_delivered)(void); +extern void (*target_reset_irq_delivered)(void); + +static inline void register_target_get_irq_delivered(int (*func)(void)) +{ + target_get_irq_delivered = func; +} + +static inline void register_target_reset_irq_delivered(void (*func)(void)) +{ + target_reset_irq_delivered = func; +} + /* PC-style peripherals (also used by other machines). */ /* serial.c */ diff --git a/vl.c b/vl.c index a143250..a2bbc61 100644 --- a/vl.c +++ b/vl.c @@ -233,6 +233,19 @@ const char *prom_envs[MAX_PROM_ENVS]; const char *nvram = NULL; int boot_menu; +static int target_get_irq_delivered_stub(void) +{ + return 1; +} + +static void target_reset_irq_delivered_stub(void) +{ + return; +} + +int (*target_get_irq_delivered)(void) = target_get_irq_delivered_stub; +void (*target_reset_irq_delivered)(void) = target_reset_irq_delivered_stub; + typedef struct FWBootEntry FWBootEntry; struct FWBootEntry { -- 1.6.2.5