| Message ID | 20200616102056.18074-1-roger.pau@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | x86/hvm: check against VIOAPIC_LEVEL_TRIG in hvm_gsi_deassert | expand |
Forgot to add maintainers. On Tue, Jun 16, 2020 at 12:20:56PM +0200, Roger Pau Monne wrote: > In order to avoid relying on the specific values of > VIOAPIC_{LEVEL/EDGE}_TRIG. > > No functional change. > > Requested-by: Jan Beulich <jbeulich@suse.com> > Signed-off-by: Roger Pau Monné <roger.pau@citrix.com> > --- > xen/arch/x86/hvm/irq.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/xen/arch/x86/hvm/irq.c b/xen/arch/x86/hvm/irq.c > index 6cbea63f4c..6772aec721 100644 > --- a/xen/arch/x86/hvm/irq.c > +++ b/xen/arch/x86/hvm/irq.c > @@ -202,7 +202,7 @@ void hvm_gsi_deassert(struct domain *d, unsigned int gsi) > int trig = vioapic_get_trigger_mode(d, gsi); > struct hvm_irq *hvm_irq = hvm_domain_irq(d); > > - if ( trig <= VIOAPIC_EDGE_TRIG || gsi >= hvm_irq->nr_gsis ) > + if ( trig != VIOAPIC_LEVEL_TRIG || gsi >= hvm_irq->nr_gsis ) > { > ASSERT(trig == VIOAPIC_EDGE_TRIG && gsi < hvm_irq->nr_gsis); > return; > -- > 2.26.2 >
On 16.06.2020 12:20, Roger Pau Monne wrote: > In order to avoid relying on the specific values of > VIOAPIC_{LEVEL/EDGE}_TRIG. > > No functional change. > > Requested-by: Jan Beulich <jbeulich@suse.com> > Signed-off-by: Roger Pau Monné <roger.pau@citrix.com> Reviewed-by: Jan Beulich <jbeulich@suse.com> Since the other patch went in, also Cc-ing Paul for a possible release ack. Jan
> -----Original Message----- > From: Jan Beulich <jbeulich@suse.com> > Sent: 16 June 2020 12:22 > To: Roger Pau Monne <roger.pau@citrix.com> > Cc: xen-devel@lists.xenproject.org; Wei Liu <wl@xen.org>; Andrew Cooper <andrew.cooper3@citrix.com>; > Paul Durrant <paul@xen.org> > Subject: Re: [PATCH] x86/hvm: check against VIOAPIC_LEVEL_TRIG in hvm_gsi_deassert > > On 16.06.2020 12:20, Roger Pau Monne wrote: > > In order to avoid relying on the specific values of > > VIOAPIC_{LEVEL/EDGE}_TRIG. > > > > No functional change. > > > > Requested-by: Jan Beulich <jbeulich@suse.com> > > Signed-off-by: Roger Pau Monné <roger.pau@citrix.com> > > Reviewed-by: Jan Beulich <jbeulich@suse.com> > > Since the other patch went in, also Cc-ing Paul for a possible > release ack. > Sure, it's trivial so... Release-acked-by: Paul Durrant <paul@xen.org>
diff --git a/xen/arch/x86/hvm/irq.c b/xen/arch/x86/hvm/irq.c index 6cbea63f4c..6772aec721 100644 --- a/xen/arch/x86/hvm/irq.c +++ b/xen/arch/x86/hvm/irq.c @@ -202,7 +202,7 @@ void hvm_gsi_deassert(struct domain *d, unsigned int gsi) int trig = vioapic_get_trigger_mode(d, gsi); struct hvm_irq *hvm_irq = hvm_domain_irq(d); - if ( trig <= VIOAPIC_EDGE_TRIG || gsi >= hvm_irq->nr_gsis ) + if ( trig != VIOAPIC_LEVEL_TRIG || gsi >= hvm_irq->nr_gsis ) { ASSERT(trig == VIOAPIC_EDGE_TRIG && gsi < hvm_irq->nr_gsis); return;
In order to avoid relying on the specific values of VIOAPIC_{LEVEL/EDGE}_TRIG. No functional change. Requested-by: Jan Beulich <jbeulich@suse.com> Signed-off-by: Roger Pau Monné <roger.pau@citrix.com> --- xen/arch/x86/hvm/irq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)