Commit 18cdeb72 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Laurent Vivier
Browse files

hw/isa/apm: Convert debug printf()s to trace events 



Convert APM_DPRINTF() to trace events and remove ifdef'ry.

Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Message-Id: <20200524164806.12658-1-f4bug@amsat.org>
Signed-off-by: default avatarLaurent Vivier <laurent@vivier.eu>
parent 3b34ee67

hw/isa/apm.c

+5 −10
Original line number Diff line number Diff line
@@ -24,14 +24,8 @@ 
#include "hw/isa/apm.h"

#include "hw/pci/pci.h"

#include "migration/vmstate.h"

#include "trace.h"



//#define DEBUG



#ifdef DEBUG

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

#else

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

#endif



/* fixed I/O location */

#define APM_STS_IOPORT  0xb3
@@ -41,8 +35,8 @@ static void apm_ioport_writeb(void *opaque, hwaddr addr, uint64_t val, 
{

    APMState *apm = opaque;

    addr &= 1;

    APM_DPRINTF("apm_ioport_writeb addr=0x%" HWADDR_PRIx

                " val=0x%02" PRIx64 "\n", addr, val);



    trace_apm_io_write(addr, val);

    if (addr == 0) {

        apm->apmc = val;
@@ -65,7 +59,8 @@ static uint64_t apm_ioport_readb(void *opaque, hwaddr addr, unsigned size) 
    } else {

        val = apm->apms;

    }

    APM_DPRINTF("apm_ioport_readb addr=0x%" HWADDR_PRIx " val=0x%02x\n", addr, val);

    trace_apm_io_read(addr, val);



    return val;

}

hw/isa/trace-events

+4 −0
Original line number Diff line number Diff line
@@ -9,3 +9,7 @@ superio_create_ide(int id, uint16_t base, unsigned int irq) "id=%d, base 0x%03x, 
# pc87312.c

pc87312_io_read(uint32_t addr, uint32_t val) "read addr=0x%x val=0x%x"

pc87312_io_write(uint32_t addr, uint32_t val) "write addr=0x%x val=0x%x"



# apm.c

apm_io_read(uint8_t addr, uint8_t val) "read addr=0x%x val=0x%02x"

apm_io_write(uint8_t addr, uint8_t val) "write addr=0x%x val=0x%02x"