| Message ID | 20201120174646.619395-6-groug@kaod.org |
|---|---|
| State | New |
| Headers | show |
| Series | spapr: Address the confusion between IPI numbers and vCPU ids | expand |
On Fri, Nov 20, 2020 at 06:46:43PM +0100, Greg Kurz wrote: > Never used from the start. > > Signed-off-by: Greg Kurz <groug@kaod.org> Applied to ppc-for-6.0, thanks. > --- > 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,
On 11/20/20 6:46 PM, Greg Kurz wrote: > Never used from the start. > > Signed-off-by: Greg Kurz <groug@kaod.org> Reviewed-by: Cédric Le Goater <clg@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, >
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,
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(-)