* [PATCH v2] spapr/xive: Fix kvm_xive_source_reset trace event
@ 2021-09-22 7:02 Cédric Le Goater
2021-09-22 7:06 ` Greg Kurz
2021-09-24 2:16 ` David Gibson
0 siblings, 2 replies; 4+ messages in thread
From: Cédric Le Goater @ 2021-09-22 7:02 UTC (permalink / raw)
To: David Gibson, Greg Kurz; +Cc: qemu-ppc, qemu-devel, Cédric Le Goater
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH v2] spapr/xive: Fix kvm_xive_source_reset trace event
2021-09-22 7:02 [PATCH v2] spapr/xive: Fix kvm_xive_source_reset trace event Cédric Le Goater
@ 2021-09-22 7:06 ` Greg Kurz
2021-09-22 7:11 ` Cédric Le Goater
2021-09-24 2:16 ` David Gibson
1 sibling, 1 reply; 4+ messages in thread
From: Greg Kurz @ 2021-09-22 7:06 UTC (permalink / raw)
To: Cédric Le Goater; +Cc: qemu-ppc, qemu-devel, David Gibson
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
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v2] spapr/xive: Fix kvm_xive_source_reset trace event
2021-09-22 7:06 ` Greg Kurz
@ 2021-09-22 7:11 ` Cédric Le Goater
0 siblings, 0 replies; 4+ messages in thread
From: Cédric Le Goater @ 2021-09-22 7:11 UTC (permalink / raw)
To: Greg Kurz; +Cc: qemu-ppc, qemu-devel, David Gibson
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
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] spapr/xive: Fix kvm_xive_source_reset trace event
2021-09-22 7:02 [PATCH v2] spapr/xive: Fix kvm_xive_source_reset trace event Cédric Le Goater
2021-09-22 7:06 ` Greg Kurz
@ 2021-09-24 2:16 ` David Gibson
1 sibling, 0 replies; 4+ messages in thread
From: David Gibson @ 2021-09-24 2:16 UTC (permalink / raw)
To: Cédric Le Goater, @yekko; +Cc: qemu-ppc, Greg Kurz, qemu-devel
[-- Attachment #1: Type: text/plain, Size: 1485 bytes --]
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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-09-24 2:27 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-22 7:02 [PATCH v2] spapr/xive: Fix kvm_xive_source_reset trace event Cédric Le Goater
2021-09-22 7:06 ` Greg Kurz
2021-09-22 7:11 ` Cédric Le Goater
2021-09-24 2:16 ` David Gibson
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).