3605 Xen HVM hangs during boot if apix is enabled

*** 373,383 ****
                  cmn_err(CE_WARN, "Could not enable evtchn interrupts\n");
                  return (-1);
          }
  
          /* Tell the hypervisor which interrupt we're waiting on. */
!         evtchn_callback_irq = ((ddi_intr_handle_impl_t *)*ihp)->ih_vector;
  
          if (set_hvm_callback(evtchn_callback_irq) != 0) {
                  cmn_err(CE_WARN, "Couldn't register evtchn callback");
                  return (-1);
          }
--- 373,383 ----
                  cmn_err(CE_WARN, "Could not enable evtchn interrupts\n");
                  return (-1);
          }
  
          /* Tell the hypervisor which interrupt we're waiting on. */
!         evtchn_callback_irq = ((ddi_intr_handle_impl_t *)*ihp)->ih_irq;
  
          if (set_hvm_callback(evtchn_callback_irq) != 0) {
                  cmn_err(CE_WARN, "Couldn't register evtchn callback");
                  return (-1);
          }