Commit 7ab6a501 authored by Laurent Vivier's avatar Laurent Vivier Committed by David Gibson
Browse files

spapr_vio: convert to trace framework instead of DPRINTF 



Signed-off-by: default avatarLaurent Vivier <lvivier@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 028ec3ce

hw/ppc/spapr_vio.c

+3 −14
Original line number Diff line number Diff line
@@ -36,19 +36,10 @@ 
#include "hw/ppc/spapr.h"

#include "hw/ppc/spapr_vio.h"

#include "hw/ppc/xics.h"

#include "trace.h"



#include <libfdt.h>



/* #define DEBUG_SPAPR */



#ifdef DEBUG_SPAPR

#define DPRINTF(fmt, ...) \

    do { fprintf(stderr, fmt, ## __VA_ARGS__); } while (0)

#else

#define DPRINTF(fmt, ...) \

    do { } while (0)

#endif



static Property spapr_vio_props[] = {

    DEFINE_PROP_UINT32("irq", VIOsPAPRDevice, irq, 0), \

    DEFINE_PROP_END_OF_LIST(),
@@ -202,9 +193,7 @@ static target_ulong h_reg_crq(PowerPCCPU *cpu, sPAPRMachineState *spapr, 
    dev->crq.qsize = queue_len;

    dev->crq.qnext = 0;



    DPRINTF("CRQ for dev 0x" TARGET_FMT_lx " registered at 0x"

            TARGET_FMT_lx "/0x" TARGET_FMT_lx "\n",

            reg, queue_addr, queue_len);

    trace_spapr_vio_h_reg_crq(reg, queue_addr, queue_len);

    return H_SUCCESS;

}
@@ -214,7 +203,7 @@ static target_ulong free_crq(VIOsPAPRDevice *dev) 
    dev->crq.qsize = 0;

    dev->crq.qnext = 0;



    DPRINTF("CRQ for dev 0x%" PRIx32 " freed\n", dev->reg);

    trace_spapr_vio_free_crq(dev->reg);



    return H_SUCCESS;

}

hw/ppc/trace-events

+4 −0
Original line number Diff line number Diff line
@@ -64,6 +64,10 @@ spapr_rtas_get_sensor_state_invalid(uint32_t index) "sensor index: 0x%"PRIx32 
spapr_rtas_ibm_configure_connector_invalid(uint32_t index) "DRC index: 0x%"PRIx32

spapr_rtas_ibm_configure_connector_missing_fdt(uint32_t index) "DRC index: 0x%"PRIx32



# hw/ppc/spapr_vio.c

spapr_vio_h_reg_crq(uint64_t reg, uint64_t queue_addr, uint64_t queue_len) "CRQ for dev 0x%" PRIx64 " registered at 0x%" PRIx64 "/0x%" PRIx64

spapr_vio_free_crq(uint32_t reg) "CRQ for dev 0x%" PRIx32 " freed"



# hw/ppc/ppc.c

ppc_tb_adjust(uint64_t offs1, uint64_t offs2, int64_t diff, int64_t seconds) "adjusted from 0x%"PRIx64" to 0x%"PRIx64", diff %"PRId64" (%"PRId64"s)"