aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--hw/intc/xics_kvm.c11
-rw-r--r--hw/ppc/spapr_irq.c1
2 files changed, 1 insertions, 11 deletions
diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c
index 2df1f3e92c..65c35f90f9 100644
--- a/hw/intc/xics_kvm.c
+++ b/hw/intc/xics_kvm.c
@@ -430,17 +430,6 @@ fail:
void xics_kvm_disconnect(SpaprMachineState *spapr, Error **errp)
{
- /* The KVM XICS device is not in use */
- if (kernel_xics_fd == -1) {
- return;
- }
-
- if (!kvm_enabled() || !kvm_check_extension(kvm_state, KVM_CAP_IRQ_XICS)) {
- error_setg(errp,
- "KVM and IRQ_XICS capability must be present for KVM XICS device");
- return;
- }
-
/*
* Only on P9 using the XICS-on XIVE KVM device:
*
diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c
index ff3df0bbd8..d07aed8ca9 100644
--- a/hw/ppc/spapr_irq.c
+++ b/hw/ppc/spapr_irq.c
@@ -86,6 +86,7 @@ static void spapr_irq_init_kvm(SpaprMachineState *spapr,
* emulated mode
*/
error_prepend(&local_err, "kernel_irqchip allowed but unavailable: ");
+ error_append_hint(&local_err, "Falling back to kernel-irqchip=off\n");
warn_report_err(local_err);
}
}