| Message ID | 20190925064534.19155-15-david@gibson.dropbear.id.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | spapr: IRQ subsystem cleanups | expand |
On 25/09/2019 08:45, David Gibson wrote: > These traces contain some useless information (the always-0 source#) and > have no equivalents for XIVE mode. For now just remove them, and we can > put back something more sensible if and when we need it. yes. they were always in the way of other changes. > Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Reviewed-by: Cédric Le Goater <clg@kaod.org> > --- > hw/ppc/spapr_irq.c | 4 ---- > hw/ppc/trace-events | 4 ---- > 2 files changed, 8 deletions(-) > > diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c > index 79167ccc68..db6755f3ab 100644 > --- a/hw/ppc/spapr_irq.c > +++ b/hw/ppc/spapr_irq.c > @@ -140,11 +140,7 @@ static void spapr_irq_free_xics(SpaprMachineState *spapr, int irq, int num) > int i; > > if (ics_valid_irq(ics, irq)) { > - trace_spapr_irq_free(0, irq, num); > for (i = srcno; i < srcno + num; ++i) { > - if (ics_irq_free(ics, i)) { > - trace_spapr_irq_free_warn(0, i); > - } > memset(&ics->irqs[i], 0, sizeof(ICSIRQState)); > } > } > diff --git a/hw/ppc/trace-events b/hw/ppc/trace-events > index 96dad767a1..9ea620f23c 100644 > --- a/hw/ppc/trace-events > +++ b/hw/ppc/trace-events > @@ -13,10 +13,6 @@ spapr_pci_msi_retry(unsigned config_addr, unsigned req_num, unsigned max_irqs) " > spapr_cas_failed(unsigned long n) "DT diff buffer is too small: %ld bytes" > spapr_cas_continue(unsigned long n) "Copy changes to the guest: %ld bytes" > > -# spapr_irq.c > -spapr_irq_free(int src, int irq, int num) "Source#%d, first irq %d, %d irqs" > -spapr_irq_free_warn(int src, int irq) "Source#%d, irq %d is already free" > - > # spapr_hcall.c > spapr_cas_pvr(uint32_t cur_pvr, bool explicit_match, uint32_t new_pvr) "current=0x%x, explicit_match=%u, new=0x%x" > spapr_h_resize_hpt_prepare(uint64_t flags, uint64_t shift) "flags=0x%"PRIx64", shift=%"PRIu64 >
On 9/25/19 8:45 AM, David Gibson wrote: > These traces contain some useless information (the always-0 source#) and > have no equivalents for XIVE mode. For now just remove them, and we can > put back something more sensible if and when we need it. > > Signed-off-by: David Gibson <david@gibson.dropbear.id.au> > --- > hw/ppc/spapr_irq.c | 4 ---- > hw/ppc/trace-events | 4 ---- > 2 files changed, 8 deletions(-) > > diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c > index 79167ccc68..db6755f3ab 100644 > --- a/hw/ppc/spapr_irq.c > +++ b/hw/ppc/spapr_irq.c > @@ -140,11 +140,7 @@ static void spapr_irq_free_xics(SpaprMachineState *spapr, int irq, int num) > int i; > > if (ics_valid_irq(ics, irq)) { > - trace_spapr_irq_free(0, irq, num); > for (i = srcno; i < srcno + num; ++i) { > - if (ics_irq_free(ics, i)) { > - trace_spapr_irq_free_warn(0, i); > - } > memset(&ics->irqs[i], 0, sizeof(ICSIRQState)); > } > } > diff --git a/hw/ppc/trace-events b/hw/ppc/trace-events > index 96dad767a1..9ea620f23c 100644 > --- a/hw/ppc/trace-events > +++ b/hw/ppc/trace-events > @@ -13,10 +13,6 @@ spapr_pci_msi_retry(unsigned config_addr, unsigned req_num, unsigned max_irqs) " > spapr_cas_failed(unsigned long n) "DT diff buffer is too small: %ld bytes" > spapr_cas_continue(unsigned long n) "Copy changes to the guest: %ld bytes" > > -# spapr_irq.c > -spapr_irq_free(int src, int irq, int num) "Source#%d, first irq %d, %d irqs" > -spapr_irq_free_warn(int src, int irq) "Source#%d, irq %d is already free" > - > # spapr_hcall.c > spapr_cas_pvr(uint32_t cur_pvr, bool explicit_match, uint32_t new_pvr) "current=0x%x, explicit_match=%u, new=0x%x" > spapr_h_resize_hpt_prepare(uint64_t flags, uint64_t shift) "flags=0x%"PRIx64", shift=%"PRIu64 > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
On Wed, 25 Sep 2019 16:45:28 +1000 David Gibson <david@gibson.dropbear.id.au> wrote: > These traces contain some useless information (the always-0 source#) and > have no equivalents for XIVE mode. For now just remove them, and we can > put back something more sensible if and when we need it. > > Signed-off-by: David Gibson <david@gibson.dropbear.id.au> > --- Reviewed-by: Greg Kurz <groug@kaod.org> > hw/ppc/spapr_irq.c | 4 ---- > hw/ppc/trace-events | 4 ---- > 2 files changed, 8 deletions(-) > > diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c > index 79167ccc68..db6755f3ab 100644 > --- a/hw/ppc/spapr_irq.c > +++ b/hw/ppc/spapr_irq.c > @@ -140,11 +140,7 @@ static void spapr_irq_free_xics(SpaprMachineState *spapr, int irq, int num) > int i; > > if (ics_valid_irq(ics, irq)) { > - trace_spapr_irq_free(0, irq, num); > for (i = srcno; i < srcno + num; ++i) { > - if (ics_irq_free(ics, i)) { > - trace_spapr_irq_free_warn(0, i); > - } > memset(&ics->irqs[i], 0, sizeof(ICSIRQState)); > } > } > diff --git a/hw/ppc/trace-events b/hw/ppc/trace-events > index 96dad767a1..9ea620f23c 100644 > --- a/hw/ppc/trace-events > +++ b/hw/ppc/trace-events > @@ -13,10 +13,6 @@ spapr_pci_msi_retry(unsigned config_addr, unsigned req_num, unsigned max_irqs) " > spapr_cas_failed(unsigned long n) "DT diff buffer is too small: %ld bytes" > spapr_cas_continue(unsigned long n) "Copy changes to the guest: %ld bytes" > > -# spapr_irq.c > -spapr_irq_free(int src, int irq, int num) "Source#%d, first irq %d, %d irqs" > -spapr_irq_free_warn(int src, int irq) "Source#%d, irq %d is already free" > - > # spapr_hcall.c > spapr_cas_pvr(uint32_t cur_pvr, bool explicit_match, uint32_t new_pvr) "current=0x%x, explicit_match=%u, new=0x%x" > spapr_h_resize_hpt_prepare(uint64_t flags, uint64_t shift) "flags=0x%"PRIx64", shift=%"PRIu64
diff --git a/hw/ppc/spapr_irq.c b/hw/ppc/spapr_irq.c index 79167ccc68..db6755f3ab 100644 --- a/hw/ppc/spapr_irq.c +++ b/hw/ppc/spapr_irq.c @@ -140,11 +140,7 @@ static void spapr_irq_free_xics(SpaprMachineState *spapr, int irq, int num) int i; if (ics_valid_irq(ics, irq)) { - trace_spapr_irq_free(0, irq, num); for (i = srcno; i < srcno + num; ++i) { - if (ics_irq_free(ics, i)) { - trace_spapr_irq_free_warn(0, i); - } memset(&ics->irqs[i], 0, sizeof(ICSIRQState)); } } diff --git a/hw/ppc/trace-events b/hw/ppc/trace-events index 96dad767a1..9ea620f23c 100644 --- a/hw/ppc/trace-events +++ b/hw/ppc/trace-events @@ -13,10 +13,6 @@ spapr_pci_msi_retry(unsigned config_addr, unsigned req_num, unsigned max_irqs) " spapr_cas_failed(unsigned long n) "DT diff buffer is too small: %ld bytes" spapr_cas_continue(unsigned long n) "Copy changes to the guest: %ld bytes" -# spapr_irq.c -spapr_irq_free(int src, int irq, int num) "Source#%d, first irq %d, %d irqs" -spapr_irq_free_warn(int src, int irq) "Source#%d, irq %d is already free" - # spapr_hcall.c spapr_cas_pvr(uint32_t cur_pvr, bool explicit_match, uint32_t new_pvr) "current=0x%x, explicit_match=%u, new=0x%x" spapr_h_resize_hpt_prepare(uint64_t flags, uint64_t shift) "flags=0x%"PRIx64", shift=%"PRIu64
These traces contain some useless information (the always-0 source#) and have no equivalents for XIVE mode. For now just remove them, and we can put back something more sensible if and when we need it. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> --- hw/ppc/spapr_irq.c | 4 ---- hw/ppc/trace-events | 4 ---- 2 files changed, 8 deletions(-)