Commit 028ec3ce authored by Laurent Vivier's avatar Laurent Vivier Committed by David Gibson
Browse files

spapr_rtas: 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 24ac7755

hw/ppc/spapr_rtas.c

+8 −22
Original line number Diff line number Diff line
@@ -45,16 +45,7 @@ 
#include <libfdt.h>

#include "hw/ppc/spapr_drc.h"

#include "qemu/cutils.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

#include "trace.h"



static sPAPRConfigureConnectorState *spapr_ccs_find(sPAPRMachineState *spapr,

                                                    uint32_t drc_index)
@@ -436,8 +427,7 @@ static void rtas_set_indicator(PowerPCCPU *cpu, sPAPRMachineState *spapr, 
    /* if this is a DR sensor we can assume sensor_index == drc_index */

    drc = spapr_dr_connector_by_index(sensor_index);

    if (!drc) {

        DPRINTF("rtas_set_indicator: invalid sensor/DRC index: %xh\n",

                sensor_index);

        trace_spapr_rtas_set_indicator_invalid(sensor_index);

        ret = RTAS_OUT_PARAM_ERROR;

        goto out;

    }
@@ -476,8 +466,7 @@ out: 


out_unimplemented:

    /* currently only DR-related sensors are implemented */

    DPRINTF("rtas_set_indicator: sensor/indicator not implemented: %d\n",

            sensor_type);

    trace_spapr_rtas_set_indicator_not_supported(sensor_index, sensor_type);

    rtas_st(rets, 0, RTAS_OUT_NOT_SUPPORTED);

}
@@ -503,7 +492,7 @@ static void rtas_get_sensor_state(PowerPCCPU *cpu, sPAPRMachineState *spapr, 


    if (sensor_type != RTAS_SENSOR_TYPE_ENTITY_SENSE) {

        /* currently only DR-related sensors are implemented */

        DPRINTF("rtas_get_sensor_state: sensor/indicator not implemented: %d\n",

        trace_spapr_rtas_get_sensor_state_not_supported(sensor_index,

                                                        sensor_type);

        ret = RTAS_OUT_NOT_SUPPORTED;

        goto out;
@@ -511,8 +500,7 @@ static void rtas_get_sensor_state(PowerPCCPU *cpu, sPAPRMachineState *spapr, 


    drc = spapr_dr_connector_by_index(sensor_index);

    if (!drc) {

        DPRINTF("rtas_get_sensor_state: invalid sensor/DRC index: %xh\n",

                sensor_index);

        trace_spapr_rtas_get_sensor_state_invalid(sensor_index);

        ret = RTAS_OUT_PARAM_ERROR;

        goto out;

    }
@@ -569,8 +557,7 @@ static void rtas_ibm_configure_connector(PowerPCCPU *cpu, 
    drc_index = rtas_ld(wa_addr, 0);

    drc = spapr_dr_connector_by_index(drc_index);

    if (!drc) {

        DPRINTF("rtas_ibm_configure_connector: invalid DRC index: %xh\n",

                drc_index);

        trace_spapr_rtas_ibm_configure_connector_invalid(drc_index);

        rc = RTAS_OUT_PARAM_ERROR;

        goto out;

    }
@@ -578,8 +565,7 @@ static void rtas_ibm_configure_connector(PowerPCCPU *cpu, 
    drck = SPAPR_DR_CONNECTOR_GET_CLASS(drc);

    fdt = drck->get_fdt(drc, NULL);

    if (!fdt) {

        DPRINTF("rtas_ibm_configure_connector: Missing FDT for DRC index: %xh\n",

                drc_index);

        trace_spapr_rtas_ibm_configure_connector_missing_fdt(drc_index);

        rc = SPAPR_DR_CC_RESPONSE_NOT_CONFIGURABLE;

        goto out;

    }

hw/ppc/trace-events

+8 −0
Original line number Diff line number Diff line
@@ -56,6 +56,14 @@ spapr_drc_realize_child(uint32_t index, char *childname) "drc: 0x%"PRIx32", chil 
spapr_drc_realize_complete(uint32_t index) "drc: 0x%"PRIx32

spapr_drc_unrealize(uint32_t index) "drc: 0x%"PRIx32



# hw/ppc/spapr_rtas.c

spapr_rtas_set_indicator_invalid(uint32_t index) "sensor index: 0x%"PRIx32

spapr_rtas_set_indicator_not_supported(uint32_t index, uint32_t type) "sensor index: 0x%"PRIx32", type: %"PRIu32

spapr_rtas_get_sensor_state_not_supported(uint32_t index, uint32_t type) "sensor index: 0x%"PRIx32", type: %"PRIu32

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/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)"