The trace event was placed in the wrong routine. Move it under
kvmppc_xive_source_reset_one().
Fixes: 4e960974d4ee ("xive: Add trace events")
Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
hw/intc/spapr_xive_kvm.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/intc/spapr_xive_kvm.c b/hw/intc/spapr_xive_kvm.c
index beb904d5bdee..bf43ffb54018 100644
--- a/hw/intc/spapr_xive_kvm.c
+++ b/hw/intc/spapr_xive_kvm.c
@@ -236,6 +236,8 @@ int kvmppc_xive_source_reset_one(XiveSource *xsrc, int srcno, Error **errp)
SpaprXive *xive = SPAPR_XIVE(xsrc->xive);
uint64_t state = 0;
+ trace_kvm_xive_source_reset(srcno);
+
assert(xive->fd != -1);
if (xive_source_irq_is_lsi(xsrc, srcno)) {
@@ -328,8 +330,6 @@ uint64_t kvmppc_xive_esb_rw(XiveSource *xsrc, int srcno, uint32_t offset,
return xive_esb_rw(xsrc, srcno, offset, data, 1);
}
- trace_kvm_xive_source_reset(srcno);
-
/*
* Special Load EOI handling for LSI sources. Q bit is never set
* and the interrupt should be re-triggered if the level is still
--
2.31.1
On Wed, Sep 22, 2021 at 09:02:05AM +0200, Cédric Le Goater wrote: > The trace event was placed in the wrong routine. Move it under > kvmppc_xive_source_reset_one(). > > Fixes: 4e960974d4ee ("xive: Add trace events") > Signed-off-by: Cédric Le Goater <clg@kaod.org> Applied to ppc-for-6.2, thanks. > --- > hw/intc/spapr_xive_kvm.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/intc/spapr_xive_kvm.c b/hw/intc/spapr_xive_kvm.c > index beb904d5bdee..bf43ffb54018 100644 > --- a/hw/intc/spapr_xive_kvm.c > +++ b/hw/intc/spapr_xive_kvm.c > @@ -236,6 +236,8 @@ int kvmppc_xive_source_reset_one(XiveSource *xsrc, int srcno, Error **errp) > SpaprXive *xive = SPAPR_XIVE(xsrc->xive); > uint64_t state = 0; > > + trace_kvm_xive_source_reset(srcno); > + > assert(xive->fd != -1); > > if (xive_source_irq_is_lsi(xsrc, srcno)) { > @@ -328,8 +330,6 @@ uint64_t kvmppc_xive_esb_rw(XiveSource *xsrc, int srcno, uint32_t offset, > return xive_esb_rw(xsrc, srcno, offset, data, 1); > } > > - trace_kvm_xive_source_reset(srcno); > - > /* > * Special Load EOI handling for LSI sources. Q bit is never set > * and the interrupt should be re-triggered if the level is still -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
On Wed, 22 Sep 2021 09:02:05 +0200 Cédric Le Goater <clg@kaod.org> wrote: > The trace event was placed in the wrong routine. Move it under > kvmppc_xive_source_reset_one(). > > Fixes: 4e960974d4ee ("xive: Add trace events") > Signed-off-by: Cédric Le Goater <clg@kaod.org> > --- Reviewed-by: Greg Kurz <groug@kaod.org> > hw/intc/spapr_xive_kvm.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/intc/spapr_xive_kvm.c b/hw/intc/spapr_xive_kvm.c > index beb904d5bdee..bf43ffb54018 100644 > --- a/hw/intc/spapr_xive_kvm.c > +++ b/hw/intc/spapr_xive_kvm.c > @@ -236,6 +236,8 @@ int kvmppc_xive_source_reset_one(XiveSource *xsrc, int srcno, Error **errp) > SpaprXive *xive = SPAPR_XIVE(xsrc->xive); > uint64_t state = 0; > > + trace_kvm_xive_source_reset(srcno); > + > assert(xive->fd != -1); > > if (xive_source_irq_is_lsi(xsrc, srcno)) { > @@ -328,8 +330,6 @@ uint64_t kvmppc_xive_esb_rw(XiveSource *xsrc, int srcno, uint32_t offset, > return xive_esb_rw(xsrc, srcno, offset, data, 1); > } > > - trace_kvm_xive_source_reset(srcno); > - > /* > * Special Load EOI handling for LSI sources. Q bit is never set > * and the interrupt should be re-triggered if the level is still
On 9/22/21 09:06, Greg Kurz wrote: > On Wed, 22 Sep 2021 09:02:05 +0200 > Cédric Le Goater <clg@kaod.org> wrote: > >> The trace event was placed in the wrong routine. Move it under >> kvmppc_xive_source_reset_one(). >> >> Fixes: 4e960974d4ee ("xive: Add trace events") >> Signed-off-by: Cédric Le Goater <clg@kaod.org> >> --- > > Reviewed-by: Greg Kurz <groug@kaod.org> Thanks, C. > >> hw/intc/spapr_xive_kvm.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/hw/intc/spapr_xive_kvm.c b/hw/intc/spapr_xive_kvm.c >> index beb904d5bdee..bf43ffb54018 100644 >> --- a/hw/intc/spapr_xive_kvm.c >> +++ b/hw/intc/spapr_xive_kvm.c >> @@ -236,6 +236,8 @@ int kvmppc_xive_source_reset_one(XiveSource *xsrc, int srcno, Error **errp) >> SpaprXive *xive = SPAPR_XIVE(xsrc->xive); >> uint64_t state = 0; >> >> + trace_kvm_xive_source_reset(srcno); >> + >> assert(xive->fd != -1); >> >> if (xive_source_irq_is_lsi(xsrc, srcno)) { >> @@ -328,8 +330,6 @@ uint64_t kvmppc_xive_esb_rw(XiveSource *xsrc, int srcno, uint32_t offset, >> return xive_esb_rw(xsrc, srcno, offset, data, 1); >> } >> >> - trace_kvm_xive_source_reset(srcno); >> - >> /* >> * Special Load EOI handling for LSI sources. Q bit is never set >> * and the interrupt should be re-triggered if the level is still >
© 2016 - 2024 Red Hat, Inc.