diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-07-29 11:34:54 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-07-29 11:34:54 +0100 |
| commit | 08831f67d3ddc578a63a2d69eb34144f62281b8b (patch) | |
| tree | 0683fb80122f82db6d263ba4ded0a0b4893c9eb4 | |
| parent | 5132f6ea62f3a6ce01b8ad968db24be99e1acc0e (diff) | |
| parent | 8d216d8c5370495fc416bb8ac573299779867aad (diff) | |
Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-4.1-20190728' into staging
ppc patch queue (for 4.1) 2019-07-28
Here's a pull request for qemu-4.1, which I hope will be the last from
the ppc tree. This applies a couple of last minute fixes for the XIVE
code.
# gpg: Signature made Sun 28 Jul 2019 07:42:11 BST
# gpg: using RSA key 75F46586AE61A66CC44E87DC6C38CACA20D9B392
# gpg: Good signature from "David Gibson <david@gibson.dropbear.id.au>" [full]
# gpg: aka "David Gibson (Red Hat) <dgibson@redhat.com>" [full]
# gpg: aka "David Gibson (ozlabs.org) <dgibson@ozlabs.org>" [full]
# gpg: aka "David Gibson (kernel.org) <dwg@kernel.org>" [unknown]
# Primary key fingerprint: 75F4 6586 AE61 A66C C44E 87DC 6C38 CACA 20D9 B392
* remotes/dgibson/tags/ppc-for-4.1-20190728:
xics/kvm: Fix fallback to emulated XICS
spapr/irq: Inform the user when falling back to emulated IC
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/intc/xics_kvm.c | 11 | ||||
| -rw-r--r-- | hw/ppc/spapr_irq.c | 1 |
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); } } |