[Xen-changelog] [xen master] x86: make sure the HVM callback vector is correctly set

[patchbot@xxxxxxx]

commit aff9115de591304a2ae26061ad0ba77f6d674ac9
Author:     Roger Pau Monné <roger.pau@xxxxxxxxxx>
AuthorDate: Thu Dec 3 15:33:40 2015 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Thu Dec 3 15:33:40 2015 +0100

    x86: make sure the HVM callback vector is correctly set

    If certain devices (like the local or the io apic) are disabled some modes
    of operation of the HVM event channel callback cannot be used. Make sure Xen
    doesn't try to setup them.

    Signed-off-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
    Acked-by: Jan Beulich <jbeulich@xxxxxxxx>
---
 xen/arch/x86/hvm/irq.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/xen/arch/x86/hvm/irq.c b/xen/arch/x86/hvm/irq.c
index 990a2ca..0f3ab6c 100644
--- a/xen/arch/x86/hvm/irq.c
+++ b/xen/arch/x86/hvm/irq.c
@@ -330,6 +330,10 @@ void hvm_set_callback_via(struct domain *d, uint64_t via)
          (via_type > HVMIRQ_callback_vector) )
         via_type = HVMIRQ_callback_none;

+    if ( via_type != HVMIRQ_callback_vector &&
+         (!has_vlapic(d) || !has_vioapic(d) || !has_vpic(d)) )
+        return;
+
     spin_lock(&d->arch.hvm_domain.irq_lock);

     /* Tear down old callback via. */
--
generated by git-patchbot for /home/xen/git/xen.git#master

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