From: Peter Xu <peterx@redhat.com>
To: Vitaly Kuznetsov <vkuznets@redhat.com>
Cc: kvm@vger.kernel.org, Nitesh Narayan Lal <nitesh@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Sean Christopherson <sean.j.christopherson@intel.com>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v4 6/6] KVM: X86: Conert the last users of "shorthand = 0" to use macros
Date: Wed, 4 Dec 2019 13:53:13 -0500 [thread overview]
Message-ID: <20191204185313.GB19939@xz-x1> (raw)
In-Reply-To: <875ziwt6h0.fsf@vitty.brq.redhat.com>
On Wed, Dec 04, 2019 at 05:12:43PM +0100, Vitaly Kuznetsov wrote:
> Peter Xu <peterx@redhat.com> writes:
>
> > Change the last users of "shorthand = 0" to use APIC_DEST_NOSHORT.
> >
> > Signed-off-by: Peter Xu <peterx@redhat.com>
> > ---
> > arch/x86/kvm/ioapic.c | 4 ++--
> > arch/x86/kvm/irq_comm.c | 2 +-
> > arch/x86/kvm/x86.c | 2 +-
> > 3 files changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/arch/x86/kvm/ioapic.c b/arch/x86/kvm/ioapic.c
> > index f53daeaaeb37..77538fd77dc2 100644
> > --- a/arch/x86/kvm/ioapic.c
> > +++ b/arch/x86/kvm/ioapic.c
> > @@ -330,7 +330,7 @@ static void ioapic_write_indirect(struct kvm_ioapic *ioapic, u32 val)
> > if (e->fields.delivery_mode == APIC_DM_FIXED) {
> > struct kvm_lapic_irq irq;
> >
> > - irq.shorthand = 0;
> > + irq.shorthand = APIC_DEST_NOSHORT;
> > irq.vector = e->fields.vector;
> > irq.delivery_mode = e->fields.delivery_mode << 8;
> > irq.dest_id = e->fields.dest_id;
> > @@ -379,7 +379,7 @@ static int ioapic_service(struct kvm_ioapic *ioapic, int irq, bool line_status)
> > irqe.trig_mode = entry->fields.trig_mode;
> > irqe.delivery_mode = entry->fields.delivery_mode << 8;
> > irqe.level = 1;
> > - irqe.shorthand = 0;
> > + irqe.shorthand = APIC_DEST_NOSHORT;
> > irqe.msi_redir_hint = false;
> >
> > if (irqe.trig_mode == IOAPIC_EDGE_TRIG)
> > diff --git a/arch/x86/kvm/irq_comm.c b/arch/x86/kvm/irq_comm.c
> > index 7d083f71fc8e..9d711c2451c7 100644
> > --- a/arch/x86/kvm/irq_comm.c
> > +++ b/arch/x86/kvm/irq_comm.c
> > @@ -121,7 +121,7 @@ void kvm_set_msi_irq(struct kvm *kvm, struct kvm_kernel_irq_routing_entry *e,
> > irq->msi_redir_hint = ((e->msi.address_lo
> > & MSI_ADDR_REDIRECTION_LOWPRI) > 0);
> > irq->level = 1;
> > - irq->shorthand = 0;
> > + irq->shorthand = APIC_DEST_NOSHORT;
> > }
> > EXPORT_SYMBOL_GPL(kvm_set_msi_irq);
> >
> > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> > index 3b00d662dc14..f6d778436e15 100644
> > --- a/arch/x86/kvm/x86.c
> > +++ b/arch/x86/kvm/x86.c
> > @@ -7355,7 +7355,7 @@ static void kvm_pv_kick_cpu_op(struct kvm *kvm, unsigned long flags, int apicid)
> > {
> > struct kvm_lapic_irq lapic_irq;
> >
> > - lapic_irq.shorthand = 0;
> > + lapic_irq.shorthand = APIC_DEST_NOSHORT;
> > lapic_irq.dest_mode = APIC_DEST_PHYSICAL;
> > lapic_irq.level = 0;
> > lapic_irq.dest_id = apicid;
>
> Reviewed-by: Vitaly Kuznetsov <vkuznets@redhat.com>
>
> And, while on it, and if you're not yet tired I just noticed that
> kvm_apic_match_dest()'s parameter is called 'short_hand' while
> everywhere else we use 'shorthand'. Value the consistency we should :-)
I'll aquash your suggested change into previous patch ("KVM: X86: Fix
callers of kvm_apic_match_dest() to use correct macros") and keep your
r-b for that, otherwise I'm afraid the change could be too trivial to
stand as itself..
Thanks,
--
Peter Xu
prev parent reply other threads:[~2019-12-04 18:53 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-03 16:58 [PATCH v4 0/6] KVM: X86: Cleanups on dest_mode and headers Peter Xu
2019-12-03 16:58 ` [PATCH v4 1/6] KVM: X86: Fix kvm_bitmap_or_dest_vcpus() to use irq shorthand Peter Xu
2019-12-03 16:58 ` [PATCH v4 2/6] KVM: X86: Move irrelevant declarations out of ioapic.h Peter Xu
2019-12-03 16:59 ` [PATCH v4 3/6] KVM: X86: Use APIC_DEST_* macros properly in kvm_lapic_irq.dest_mode Peter Xu
2019-12-03 22:07 ` Sean Christopherson
2019-12-03 22:15 ` Peter Xu
2019-12-03 22:20 ` Sean Christopherson
2019-12-04 18:48 ` Peter Xu
2019-12-03 16:59 ` [PATCH v4 4/6] KVM: X86: Drop KVM_APIC_SHORT_MASK and KVM_APIC_DEST_MASK Peter Xu
2019-12-03 16:59 ` [PATCH v4 5/6] KVM: X86: Fix callers of kvm_apic_match_dest() to use correct macros Peter Xu
2019-12-03 16:59 ` [PATCH v4 6/6] KVM: X86: Conert the last users of "shorthand = 0" to use macros Peter Xu
2019-12-04 16:12 ` Vitaly Kuznetsov
2019-12-04 18:53 ` Peter Xu [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191204185313.GB19939@xz-x1 \
--to=peterx@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nitesh@redhat.com \
--cc=pbonzini@redhat.com \
--cc=sean.j.christopherson@intel.com \
--cc=vkuznets@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).