Commit a2e6ffab authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Paolo Bonzini
Browse files

ioapic/tracing: Remove last DPRINTFs 



Remove the last few DPRINTFs from hw/intc/ioapic.c and turn
them into tracing.  In one case it's a new trace, in the others
it's just adding a parameter to the existing traces.

Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20171102180310.24760-1-dgilbert@redhat.com>
Reviewed-by: default avatarPeter Xu <peterx@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent e5a11847

hw/intc/ioapic.c

+3 −14
Original line number Diff line number Diff line
@@ -35,15 +35,6 @@ 
#include "hw/i386/x86-iommu.h"

#include "trace.h"



//#define DEBUG_IOAPIC



#ifdef DEBUG_IOAPIC

#define DPRINTF(fmt, ...)                                       \

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

#else

#define DPRINTF(fmt, ...)

#endif



#define APIC_DELIVERY_MODE_SHIFT 8

#define APIC_POLARITY_SHIFT 14

#define APIC_TRIG_MODE_SHIFT 15
@@ -157,7 +148,7 @@ static void ioapic_set_irq(void *opaque, int vector, int level) 
     * to GSI 2.  GSI maps to ioapic 1-1.  This is not

     * the cleanest way of doing it but it should work. */



    DPRINTF("%s: %s vec %x\n", __func__, level ? "raise" : "lower", vector);

    trace_ioapic_set_irq(vector, level);

    if (vector == 0) {

        vector = 2;

    }
@@ -290,11 +281,10 @@ ioapic_mem_read(void *opaque, hwaddr addr, unsigned int size) 
                }

            }

        }

        DPRINTF("read: %08x = %08x\n", s->ioregsel, val);

        break;

    }



    trace_ioapic_mem_read(addr, size, val);

    trace_ioapic_mem_read(addr, s->ioregsel, size, val);



    return val;

}
@@ -335,7 +325,7 @@ ioapic_mem_write(void *opaque, hwaddr addr, uint64_t val, 
    int index;



    addr &= 0xff;

    trace_ioapic_mem_write(addr, size, val);

    trace_ioapic_mem_write(addr, s->ioregsel, size, val);



    switch (addr) {

    case IOAPIC_IOREGSEL:
@@ -345,7 +335,6 @@ ioapic_mem_write(void *opaque, hwaddr addr, uint64_t val, 
        if (size != 4) {

            break;

        }

        DPRINTF("write: %08x = %08" PRIx64 "\n", s->ioregsel, val);

        switch (s->ioregsel) {

        case IOAPIC_REG_ID:

            s->id = (val >> IOAPIC_ID_SHIFT) & IOAPIC_ID_MASK;

hw/intc/trace-events

+3 −2
Original line number Diff line number Diff line
@@ -18,8 +18,9 @@ apic_mem_writel(uint64_t addr, uint32_t val) "0x%"PRIx64" = 0x%08x" 
ioapic_set_remote_irr(int n) "set remote irr for pin %d"

ioapic_clear_remote_irr(int n, int vector) "clear remote irr for pin %d vector %d"

ioapic_eoi_broadcast(int vector) "EOI broadcast for vector %d"

ioapic_mem_read(uint8_t addr, uint8_t size, uint32_t val) "ioapic mem read addr 0x%"PRIx8" size 0x%"PRIx8" retval 0x%"PRIx32

ioapic_mem_write(uint8_t addr, uint8_t size, uint32_t val) "ioapic mem write addr 0x%"PRIx8" size 0x%"PRIx8" val 0x%"PRIx32

ioapic_mem_read(uint8_t addr, uint8_t regsel, uint8_t size, uint32_t val) "ioapic mem read addr 0x%"PRIx8" regsel: 0x%"PRIx8" size 0x%"PRIx8" retval 0x%"PRIx32

ioapic_mem_write(uint8_t addr, uint8_t regsel, uint8_t size, uint32_t val) "ioapic mem write addr 0x%"PRIx8" regsel: 0x%"PRIx8" size 0x%"PRIx8" val 0x%"PRIx32

ioapic_set_irq(int vector, int level) "vector: %d level: %d"



# hw/intc/slavio_intctl.c

slavio_intctl_mem_readl(uint32_t cpu, uint64_t addr, uint32_t ret) "read cpu %d reg 0x%"PRIx64" = 0x%x"