| Message ID | 20180126092029.20737-2-mark.cave-ayland@ilande.co.uk |
|---|---|
| State | New |
| Headers | show |
| Series | ppc: trivial Mac-related trace-events patches | expand |
On Fri, Jan 26, 2018 at 09:20:27AM +0000, Mark Cave-Ayland wrote: > Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Applied to ppc-for-2.12. > --- > hw/pci-host/grackle.c | 13 ++----------- > hw/pci-host/trace-events | 3 +++ > 2 files changed, 5 insertions(+), 11 deletions(-) > > diff --git a/hw/pci-host/grackle.c b/hw/pci-host/grackle.c > index 3caf1ccb37..033588b7d2 100644 > --- a/hw/pci-host/grackle.c > +++ b/hw/pci-host/grackle.c > @@ -27,16 +27,7 @@ > #include "hw/pci/pci_host.h" > #include "hw/ppc/mac.h" > #include "hw/pci/pci.h" > - > -/* debug Grackle */ > -//#define DEBUG_GRACKLE > - > -#ifdef DEBUG_GRACKLE > -#define GRACKLE_DPRINTF(fmt, ...) \ > - do { printf("GRACKLE: " fmt , ## __VA_ARGS__); } while (0) > -#else > -#define GRACKLE_DPRINTF(fmt, ...) > -#endif > +#include "trace.h" > > #define GRACKLE_PCI_HOST_BRIDGE(obj) \ > OBJECT_CHECK(GrackleState, (obj), TYPE_GRACKLE_PCI_HOST_BRIDGE) > @@ -58,7 +49,7 @@ static void pci_grackle_set_irq(void *opaque, int irq_num, int level) > { > qemu_irq *pic = opaque; > > - GRACKLE_DPRINTF("set_irq num %d level %d\n", irq_num, level); > + trace_grackle_set_irq(irq_num, level); > qemu_set_irq(pic[irq_num + 0x15], level); > } > > diff --git a/hw/pci-host/trace-events b/hw/pci-host/trace-events > index 32dfc84692..5b8fcc228b 100644 > --- a/hw/pci-host/trace-events > +++ b/hw/pci-host/trace-events > @@ -1,5 +1,8 @@ > # See docs/devel/tracing.txt for syntax documentation. > > +# hw/pci-host/grackle.c > +grackle_set_irq(int irq_num, int level) "set_irq num %d level %d" > + > # hw/pci-host/sabre.c > sabre_set_request(int irq_num) "request irq %d" > sabre_clear_request(int irq_num) "clear request irq %d"
diff --git a/hw/pci-host/grackle.c b/hw/pci-host/grackle.c index 3caf1ccb37..033588b7d2 100644 --- a/hw/pci-host/grackle.c +++ b/hw/pci-host/grackle.c @@ -27,16 +27,7 @@ #include "hw/pci/pci_host.h" #include "hw/ppc/mac.h" #include "hw/pci/pci.h" - -/* debug Grackle */ -//#define DEBUG_GRACKLE - -#ifdef DEBUG_GRACKLE -#define GRACKLE_DPRINTF(fmt, ...) \ - do { printf("GRACKLE: " fmt , ## __VA_ARGS__); } while (0) -#else -#define GRACKLE_DPRINTF(fmt, ...) -#endif +#include "trace.h" #define GRACKLE_PCI_HOST_BRIDGE(obj) \ OBJECT_CHECK(GrackleState, (obj), TYPE_GRACKLE_PCI_HOST_BRIDGE) @@ -58,7 +49,7 @@ static void pci_grackle_set_irq(void *opaque, int irq_num, int level) { qemu_irq *pic = opaque; - GRACKLE_DPRINTF("set_irq num %d level %d\n", irq_num, level); + trace_grackle_set_irq(irq_num, level); qemu_set_irq(pic[irq_num + 0x15], level); } diff --git a/hw/pci-host/trace-events b/hw/pci-host/trace-events index 32dfc84692..5b8fcc228b 100644 --- a/hw/pci-host/trace-events +++ b/hw/pci-host/trace-events @@ -1,5 +1,8 @@ # See docs/devel/tracing.txt for syntax documentation. +# hw/pci-host/grackle.c +grackle_set_irq(int irq_num, int level) "set_irq num %d level %d" + # hw/pci-host/sabre.c sabre_set_request(int irq_num) "request irq %d" sabre_clear_request(int irq_num) "clear request irq %d"
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> --- hw/pci-host/grackle.c | 13 ++----------- hw/pci-host/trace-events | 3 +++ 2 files changed, 5 insertions(+), 11 deletions(-)