[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH for-6.0 5/8] spapr/xics: Drop unused argument to xics_kvm_has_bro
From: |
Greg Kurz |
Subject: |
[PATCH for-6.0 5/8] spapr/xics: Drop unused argument to xics_kvm_has_broken_disconnect() |
Date: |
Fri, 20 Nov 2020 18:46:43 +0100 |
Never used from the start.
Signed-off-by: Greg Kurz <groug@kaod.org>
---
include/hw/ppc/xics_spapr.h | 2 +-
hw/intc/xics_kvm.c | 2 +-
hw/ppc/spapr_irq.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/hw/ppc/xics_spapr.h b/include/hw/ppc/xics_spapr.h
index 0b8182e40b33..de752c0d2c7e 100644
--- a/include/hw/ppc/xics_spapr.h
+++ b/include/hw/ppc/xics_spapr.h
@@ -38,6 +38,6 @@ DECLARE_INSTANCE_CHECKER(ICSState, ICS_SPAPR,
int xics_kvm_connect(SpaprInterruptController *intc, uint32_t nr_servers,
Error **errp);
void xics_kvm_disconnect(SpaprInterruptController *intc);
-bool xics_kvm_has_broken_disconnect(SpaprMachineState *spapr);
+bool xics_kvm_has_broken_disconnect(void);
#endif /* XICS_SPAPR_H */
diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c
index 68bb1914b9bb..570d635bcc08 100644
--- a/hw/intc/xics_kvm.c
+++ b/hw/intc/xics_kvm.c
@@ -484,7 +484,7 @@ void xics_kvm_disconnect(SpaprInterruptController *intc)
* support destruction of a KVM XICS device while the VM is running.
* Required to start a spapr machine with ic-mode=dual,kernel-irqchip=on.
*/
-bool xics_kvm_has_broken_disconnect(SpaprMachineState *spapr)
+bool xics_kvm_has_broken_disconnect(void)
{
int rc;
diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c
index a0fc474ecb06..2dacbecfd5fd 100644
--- a/hw/ppc/spapr_irq.c
+++ b/hw/ppc/spapr_irq.c
@@ -186,7 +186,7 @@ static int spapr_irq_check(SpaprMachineState *spapr, Error
**errp)
if (kvm_enabled() &&
spapr->irq == &spapr_irq_dual &&
kvm_kernel_irqchip_required() &&
- xics_kvm_has_broken_disconnect(spapr)) {
+ xics_kvm_has_broken_disconnect()) {
error_setg(errp,
"KVM is incompatible with ic-mode=dual,kernel-irqchip=on");
error_append_hint(errp,
--
2.26.2
- [PATCH for-6.0 0/8] spapr: Address the confusion between IPI numbers and vCPU ids, Greg Kurz, 2020/11/20
- [PATCH for-6.0 4/8] spapr/xive: Add "nr-ipis" property, Greg Kurz, 2020/11/20
- [PATCH for-6.0 1/8] spapr/xive: Turn some sanity checks into assertions, Greg Kurz, 2020/11/20
- [PATCH for-6.0 5/8] spapr/xics: Drop unused argument to xics_kvm_has_broken_disconnect(),
Greg Kurz <=
- [PATCH for-6.0 6/8] spapr/xics: Add "nr-servers" property, Greg Kurz, 2020/11/20
- [PATCH for-6.0 7/8] spapr: Drop "nr_servers" argument of the sPAPR IC activate() operation, Greg Kurz, 2020/11/20
- [PATCH for-6.0 2/8] spapr/xive: Introduce spapr_xive_nr_ends(), Greg Kurz, 2020/11/20