Commit bfec08b5 authored by Mark Cave-Ayland's avatar Mark Cave-Ayland
Browse files

sabre: convert from SABRE_DPRINTF macro to trace-events 



Signed-off-by: default avatarMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
CC: Michael S. Tsirkin <mst@redhat.com>
CC: Marcel Apfelbaum <marcel@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: default avatarArtyom Tarasenko <atar4qemu@gmail.com>
[for addition of trace-events to hw/pci-host]
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 9b301794

Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ trace-events-subdirs += hw/i386/xen 
trace-events-subdirs += hw/9pfs

trace-events-subdirs += hw/ppc

trace-events-subdirs += hw/pci

trace-events-subdirs += hw/pci-host

trace-events-subdirs += hw/s390x

trace-events-subdirs += hw/vfio

trace-events-subdirs += hw/acpi

hw/pci-host/sabre.c

+10 −22
Original line number Diff line number Diff line
@@ -36,16 +36,7 @@ 
#include "exec/address-spaces.h"

#include "qapi/error.h"

#include "qemu/log.h"



/* debug sabre */

//#define DEBUG_SABRE



#ifdef DEBUG_SABRE

#define SABRE_DPRINTF(fmt, ...) \

do { printf("sabre: " fmt , ## __VA_ARGS__); } while (0)

#else

#define SABRE_DPRINTF(fmt, ...)

#endif

#include "trace.h"



/*

 * Chipset docs:
@@ -69,8 +60,7 @@ do { printf("sabre: " fmt , ## __VA_ARGS__); } while (0) 


static inline void sabre_set_request(SabreState *s, unsigned int irq_num)

{

    SABRE_DPRINTF("%s: request irq %d\n", __func__, irq_num);



    trace_sabre_set_request(irq_num);

    s->irq_request = irq_num;

    qemu_set_irq(s->ivec_irqs[irq_num], 1);

}
@@ -108,7 +98,7 @@ static inline void sabre_check_irqs(SabreState *s) 


static inline void sabre_clear_request(SabreState *s, unsigned int irq_num)

{

    SABRE_DPRINTF("%s: clear request irq %d\n", __func__, irq_num);

    trace_sabre_clear_request(irq_num);

    qemu_set_irq(s->ivec_irqs[irq_num], 0);

    s->irq_request = NO_IRQ_REQUEST;

}
@@ -125,8 +115,7 @@ static void sabre_config_write(void *opaque, hwaddr addr, 
{

    SabreState *s = opaque;



    SABRE_DPRINTF("%s: addr " TARGET_FMT_plx " val %" PRIx64 "\n", __func__,

                  addr, val);

    trace_sabre_config_write(addr, val);



    switch (addr & 0xffff) {

    case 0x30 ... 0x4f: /* DMA error registers */
@@ -250,7 +239,7 @@ static uint64_t sabre_config_read(void *opaque, 
        val = 0;

        break;

    }

    SABRE_DPRINTF("%s: addr " TARGET_FMT_plx " -> %x\n", __func__, addr, val);

    trace_sabre_config_read(addr, val);



    return val;

}
@@ -267,8 +256,7 @@ static void sabre_pci_config_write(void *opaque, hwaddr addr, 
    SabreState *s = opaque;

    PCIHostState *phb = PCI_HOST_BRIDGE(s);



    SABRE_DPRINTF("%s: addr " TARGET_FMT_plx " val %" PRIx64 "\n", __func__,

                  addr, val);

    trace_sabre_pci_config_write(addr, val);

    pci_data_write(phb->bus, addr, val, size);

}
@@ -280,7 +268,7 @@ static uint64_t sabre_pci_config_read(void *opaque, hwaddr addr, 
    PCIHostState *phb = PCI_HOST_BRIDGE(s);



    ret = pci_data_read(phb->bus, addr, size);

    SABRE_DPRINTF("%s: addr " TARGET_FMT_plx " -> %x\n", __func__, addr, ret);

    trace_sabre_pci_config_read(addr, ret);

    return ret;

}
@@ -318,7 +306,8 @@ static void pci_sabre_set_irq(void *opaque, int irq_num, int level) 
{

    SabreState *s = opaque;



    SABRE_DPRINTF("%s: set irq_in %d level %d\n", __func__, irq_num, level);

    trace_sabre_pci_set_irq(irq_num, level);



    /* PCI IRQ map onto the first 32 INO.  */

    if (irq_num < 32) {

        if (level) {
@@ -332,8 +321,7 @@ static void pci_sabre_set_irq(void *opaque, int irq_num, int level) 
    } else {

        /* OBIO IRQ map onto the next 32 INO.  */

        if (level) {

            SABRE_DPRINTF("%s: set irq %d level %d\n", __func__, irq_num,

                          level);

            trace_sabre_pci_set_obio_irq(irq_num, level);

            s->pci_irq_in |= 1ULL << irq_num;

            if ((s->irq_request == NO_IRQ_REQUEST)

                && (s->obio_irq_map[irq_num - 32] & PBM_PCI_IMR_ENABLED)) {

hw/pci-host/trace-events

0 → 100644
+11 −0
Original line number Diff line number Diff line 
# See docs/devel/tracing.txt for syntax documentation.



# hw/pci-host/sabre.c

sabre_set_request(int irq_num) "request irq %d"

sabre_clear_request(int irq_num) "clear request irq %d"

sabre_config_write(uint64_t addr, uint64_t val) "addr 0x%"PRIx64" val 0x%"PRIx64

sabre_config_read(uint64_t addr, uint64_t val) "addr 0x%"PRIx64" val 0x%"PRIx64

sabre_pci_config_write(uint64_t addr, uint64_t val) "addr 0x%"PRIx64" val 0x%"PRIx64

sabre_pci_config_read(uint64_t addr, uint64_t val) "addr 0x%"PRIx64" val 0x%"PRIx64

sabre_pci_set_irq(int irq_num, int level) "set irq_in %d level %d"

sabre_pci_set_obio_irq(int irq_num, int level) "set irq %d level %d"