ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

spapr_rtas: convert to trace framework instead of DPRINTF 

Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Laurent Vivier 2016-09-14 20:48:24 +02:00 committed by David Gibson
parent 24ac7755d7
commit 028ec3cee3
2 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
hw/ppc/spapr_rtas.c
View File

@ -45,16 +45,7 @@
#include <libfdt.h> #include <libfdt.h>
#include "hw/ppc/spapr_drc.h" #include "hw/ppc/spapr_drc.h"
#include "qemu/cutils.h" #include "qemu/cutils.h"
#include "trace.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 sPAPRConfigureConnectorState *spapr_ccs_find(sPAPRMachineState *spapr, static sPAPRConfigureConnectorState *spapr_ccs_find(sPAPRMachineState *spapr,
uint32_t drc_index) 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 */ /* if this is a DR sensor we can assume sensor_index == drc_index */
drc = spapr_dr_connector_by_index(sensor_index); drc = spapr_dr_connector_by_index(sensor_index);
if (!drc) { if (!drc) {
DPRINTF("rtas_set_indicator: invalid sensor/DRC index: %xh\n", trace_spapr_rtas_set_indicator_invalid(sensor_index);
sensor_index);
ret = RTAS_OUT_PARAM_ERROR; ret = RTAS_OUT_PARAM_ERROR;
goto out; goto out;
} }
@ -476,8 +466,7 @@ out:
out_unimplemented: out_unimplemented:
/* currently only DR-related sensors are implemented */ /* currently only DR-related sensors are implemented */
DPRINTF("rtas_set_indicator: sensor/indicator not implemented: %d\n", trace_spapr_rtas_set_indicator_not_supported(sensor_index, sensor_type);
sensor_type);
rtas_st(rets, 0, RTAS_OUT_NOT_SUPPORTED); rtas_st(rets, 0, RTAS_OUT_NOT_SUPPORTED);
} }
@ -503,16 +492,15 @@ static void rtas_get_sensor_state(PowerPCCPU *cpu, sPAPRMachineState *spapr,
if (sensor_type != RTAS_SENSOR_TYPE_ENTITY_SENSE) { if (sensor_type != RTAS_SENSOR_TYPE_ENTITY_SENSE) {
/* currently only DR-related sensors are implemented */ /* 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); sensor_type);
ret = RTAS_OUT_NOT_SUPPORTED; ret = RTAS_OUT_NOT_SUPPORTED;
goto out; goto out;
} }
drc = spapr_dr_connector_by_index(sensor_index); drc = spapr_dr_connector_by_index(sensor_index);
if (!drc) { if (!drc) {
DPRINTF("rtas_get_sensor_state: invalid sensor/DRC index: %xh\n", trace_spapr_rtas_get_sensor_state_invalid(sensor_index);
sensor_index);
ret = RTAS_OUT_PARAM_ERROR; ret = RTAS_OUT_PARAM_ERROR;
goto out; goto out;
} }
@ -569,8 +557,7 @@ static void rtas_ibm_configure_connector(PowerPCCPU *cpu,
drc_index = rtas_ld(wa_addr, 0); drc_index = rtas_ld(wa_addr, 0);
drc = spapr_dr_connector_by_index(drc_index); drc = spapr_dr_connector_by_index(drc_index);
if (!drc) { if (!drc) {
DPRINTF("rtas_ibm_configure_connector: invalid DRC index: %xh\n", trace_spapr_rtas_ibm_configure_connector_invalid(drc_index);
drc_index);
rc = RTAS_OUT_PARAM_ERROR; rc = RTAS_OUT_PARAM_ERROR;
goto out; goto out;
} }
@ -578,8 +565,7 @@ static void rtas_ibm_configure_connector(PowerPCCPU *cpu,
drck = SPAPR_DR_CONNECTOR_GET_CLASS(drc); drck = SPAPR_DR_CONNECTOR_GET_CLASS(drc);
fdt = drck->get_fdt(drc, NULL); fdt = drck->get_fdt(drc, NULL);
if (!fdt) { if (!fdt) {
DPRINTF("rtas_ibm_configure_connector: Missing FDT for DRC index: %xh\n", trace_spapr_rtas_ibm_configure_connector_missing_fdt(drc_index);
drc_index);
rc = SPAPR_DR_CC_RESPONSE_NOT_CONFIGURABLE; rc = SPAPR_DR_CC_RESPONSE_NOT_CONFIGURABLE;
goto out; goto out;
} }

8
hw/ppc/trace-events
View File

@ -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_realize_complete(uint32_t index) "drc: 0x%"PRIx32
spapr_drc_unrealize(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 # 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)" 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)"