Commit b37d56ec authored by Markus Armbruster's avatar Markus Armbruster Committed by Michael S. Tsirkin
Browse files

acpi/piix4: Convert debug printf()s to trace events 



Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <20190402161900.7374-2-armbru@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
parent 6b8f9c6e

hw/acpi/piix4.c

+3 −11
Original line number Diff line number Diff line
@@ -39,14 +39,7 @@ 
#include "hw/acpi/acpi_dev_interface.h"

#include "hw/xen/xen.h"

#include "qom/cpu.h"



//#define DEBUG



#ifdef DEBUG

# define PIIX4_DPRINTF(format, ...)     printf(format, ## __VA_ARGS__)

#else

# define PIIX4_DPRINTF(format, ...)     do { } while (0)

#endif

#include "trace.h"



#define GPE_BASE 0xafe0

#define GPE_LEN 4
@@ -583,7 +576,7 @@ static uint64_t gpe_readb(void *opaque, hwaddr addr, unsigned width) 
    PIIX4PMState *s = opaque;

    uint32_t val = acpi_gpe_ioport_readb(&s->ar, addr);



    PIIX4_DPRINTF("gpe read %" HWADDR_PRIx " == %" PRIu32 "\n", addr, val);

    trace_piix4_gpe_readb(addr, width, val);

    return val;

}
@@ -592,10 +585,9 @@ static void gpe_writeb(void *opaque, hwaddr addr, uint64_t val, 
{

    PIIX4PMState *s = opaque;



    trace_piix4_gpe_writeb(addr, width, val);

    acpi_gpe_ioport_writeb(&s->ar, addr, val);

    acpi_update_sci(&s->ar, s->irq);



    PIIX4_DPRINTF("gpe write %" HWADDR_PRIx " <== %" PRIu64 "\n", addr, val);

}



static const MemoryRegionOps piix4_gpe_ops = {

hw/acpi/trace-events

+4 −0
Original line number Diff line number Diff line
@@ -31,6 +31,10 @@ cpuhp_acpi_ejecting_cpu(uint32_t idx) "0x%"PRIx32 
cpuhp_acpi_write_ost_ev(uint32_t slot, uint32_t ev) "idx[0x%"PRIx32"] OST EVENT: 0x%"PRIx32

cpuhp_acpi_write_ost_status(uint32_t slot, uint32_t st) "idx[0x%"PRIx32"] OST STATUS: 0x%"PRIx32



# piix4.c

piix4_gpe_readb(uint64_t addr, unsigned width, uint64_t val) "addr: 0x%" PRIx64 " width: %d ==> 0x%" PRIx64

piix4_gpe_writeb(uint64_t addr, unsigned width, uint64_t val) "addr: 0x%" PRIx64 " width: %d <== 0x%" PRIx64



# tco.c

tco_timer_reload(int ticks, int msec) "ticks=%d (%d ms)"

tco_timer_expired(int timeouts_no, bool strap, bool no_reboot) "timeouts_no=%d no_reboot=%d/%d"