3605 Xen HVM hangs during boot if apix is enabled

@@ -948,10 +948,12 @@
         if (!add_avintr((void *)hdlp, hdlp->ih_pri, hdlp->ih_cb_func,
             DEVI(rdip)->devi_name, irq, hdlp->ih_cb_arg1,
             hdlp->ih_cb_arg2, &ihdl_plat_datap->ip_ticks, rdip))
                 return (DDI_FAILURE);
 
+        if (hdlp->ih_irq == -1)
+                hdlp->ih_irq = irq;
         hdlp->ih_vector = irq;
 
         return (DDI_SUCCESS);
 }