[Xen-changelog] [xen-4.1-testing] x86/hvm: pv-on-hvm: fix de/assert_irq checks

[Xen patchbot-4.1-testing <patchbot@xxxxxxx>]

# HG changeset patch
# User Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
# Date 1305188409 -3600
# Node ID bf9a086b4d63641c343e775b9240b6d2639006d9
# Parent  bd9b2a06768249caf1e6aaf1eb610adacb8d216e
x86/hvm: pv-on-hvm: fix de/assert_irq checks

The checks in assert_irq and deassert_irq to distinguish interrupts
that have been remapped onto event channels from the others that have
to be injected using the emulated lapic are wrong.

Fix the condition checks using the convenient hvm_domain_use_pirq
function.

Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
xen-unstable changeset:   23335:0957e0c5f0e4
xen-unstable date:        Thu May 12 09:15:05 2011 +0100
---


diff -r bd9b2a067682 -r bf9a086b4d63 xen/arch/x86/hvm/irq.c
--- a/xen/arch/x86/hvm/irq.c    Thu May 12 09:19:29 2011 +0100
+++ b/xen/arch/x86/hvm/irq.c    Thu May 12 09:20:09 2011 +0100
@@ -31,7 +31,7 @@
 static void assert_irq(struct domain *d, unsigned ioapic_gsi, unsigned pic_irq)
 {
     int pirq = domain_emuirq_to_pirq(d, ioapic_gsi);
-    if ( pirq != IRQ_UNBOUND )
+    if ( hvm_domain_use_pirq(d, pirq) )
     {
         send_guest_pirq(d, pirq);
         return;
@@ -43,7 +43,8 @@
 /* Must be called with hvm_domain->irq_lock hold */
 static void deassert_irq(struct domain *d, unsigned isa_irq)
 {
-    if ( domain_emuirq_to_pirq(d, isa_irq) != IRQ_UNBOUND )
+    int pirq = domain_emuirq_to_pirq(d, isa_irq);
+    if ( !hvm_domain_use_pirq(d, pirq) )
         vpic_irq_negative_edge(d, isa_irq);
 }
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog