On 11/12/19 16:02, Daniel P. Berrangé wrote:
> Missing commit message subject line :-)
I'm not fast enough at Ctrl-C, it seems!
Paolo
> On Wed, Dec 11, 2019 at 03:46:33PM +0100, Paolo Bonzini wrote:
>> ---
>> hw/ppc/e500.c | 1 -
>> hw/ppc/spapr_irq.c | 8 --------
>> 2 files changed, 9 deletions(-)
>>
>> diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
>> index 928efaa..12b6a5b 100644
>> --- a/hw/ppc/e500.c
>> +++ b/hw/ppc/e500.c
>> @@ -793,7 +793,6 @@ static DeviceState
>> *ppce500_init_mpic(PPCE500MachineState *pms,
>> MemoryRegion *ccsr,
>> IrqLines *irqs)
>> {
>> - MachineState *machine = MACHINE(pms);
>> const PPCE500MachineClass *pmc = PPCE500_MACHINE_GET_CLASS(pms);
>> DeviceState *dev = NULL;
>> SysBusDevice *s;
>> diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c
>> index c3f8870..15c3dd4 100644
>> --- a/hw/ppc/spapr_irq.c
>> +++ b/hw/ppc/spapr_irq.c
>> @@ -74,7 +74,6 @@ int spapr_irq_init_kvm(int (*fn)(SpaprInterruptController
>> *, Error **),
>> SpaprInterruptController *intc,
>> Error **errp)
>> {
>> - MachineState *machine = MACHINE(qdev_get_machine());
>> Error *local_err = NULL;
>>
>> if (kvm_enabled() && kvm_kernel_irqchip_allowed()) {
>> @@ -287,7 +286,6 @@ uint32_t spapr_irq_nr_msis(SpaprMachineState *spapr)
>>
>> void spapr_irq_init(SpaprMachineState *spapr, Error **errp)
>> {
>> - MachineState *machine = MACHINE(spapr);
>> SpaprMachineClass *smc = SPAPR_MACHINE_GET_CLASS(spapr);
>>
>> if (kvm_enabled() && kvm_kernel_irqchip_split()) {
>> @@ -295,12 +293,6 @@ void spapr_irq_init(SpaprMachineState *spapr, Error
>> **errp)
>> return;
>> }
>>
>> - if (!kvm_enabled() && kvm_kernel_irqchip_required()) {
>> - error_setg(errp,
>> - "kernel_irqchip requested but only available with KVM");
>> - return;
>> - }
>> -
>> if (spapr_irq_check(spapr, errp) < 0) {
>> return;
>> }
>> --
>> 1.8.3.1
>>
>>
>
> Regards,
> Daniel
>
