Re: [PATCH v3 5/5] KVM: X86: Fix callers of kvm_apic_match_dest() to use correct macros

Sean Christopherson
2019-12-03T16:32:57Z

On Tue, Dec 03, 2019 at 11:27:47AM -0500, Peter Xu wrote:
> On Tue, Dec 03, 2019 at 02:23:47PM +0100, Vitaly Kuznetsov wrote:
> > > @@ -250,8 +252,9 @@ void kvm_ioapic_scan_entry(struct kvm_vcpu *vcpu, ulong *ioapic_handled_vectors)
> > > if (e->fields.trig_mode == IOAPIC_LEVEL_TRIG ||
> > > kvm_irq_has_notifier(ioapic->kvm, KVM_IRQCHIP_IOAPIC, index) ||
> > > index == RTC_GSI) {
> > > - if (kvm_apic_match_dest(vcpu, NULL, 0,
> > > - e->fields.dest_id, e->fields.dest_mode) ||
> > > + dm = kvm_lapic_irq_dest_mode(e->fields.dest_mode);
> >
> > Nit: you could've defined 'dm' right here in the block (after '{') but
> > in any case I'd suggest to stick to 'dest_mode' and not shorten it to
> > 'dm' for consistency.
> >
> > > + if (kvm_apic_match_dest(vcpu, NULL, APIC_DEST_NOSHORT,
> > > + e->fields.dest_id, dm) ||
> > > kvm_apic_pending_eoi(vcpu, e->fields.vector))
> > > __set_bit(e->fields.vector,
> > > ioapic_handled_vectors);
> > > diff --git a/arch/x86/kvm/irq_comm.c b/arch/x86/kvm/irq_comm.c
> > > index 5f59e5ebdbed..e89c2160b39f 100644
> > > --- a/arch/x86/kvm/irq_comm.c
> > > +++ b/arch/x86/kvm/irq_comm.c
> > > @@ -417,7 +417,8 @@ void kvm_scan_ioapic_routes(struct kvm_vcpu *vcpu,
> > >
> > > kvm_set_msi_irq(vcpu->kvm, entry, &irq);
> > >
> > > - if (irq.level && kvm_apic_match_dest(vcpu, NULL, 0,
> > > + if (irq.level &&
> > > + kvm_apic_match_dest(vcpu, NULL, APIC_DEST_NOSHORT,
> > > irq.dest_id, irq.dest_mode))
> > > __set_bit(irq.vector, ioapic_handled_vectors);
> > > }
> >
> > Reviewed-by: Vitaly Kuznetsov <vkuznets@redhat.com>
>
> I'll move the declaration in with your r-b. 'dm' is a silly trick of
> mine to avoid the 80-char line limit. Thanks,

The 80-char limit isn't an unbreakable rule, it's ok for a line to run a
few chars over when there is no better alternative.