Commit f6e35343 authored by Markus Armbruster's avatar Markus Armbruster Committed by Blue Swirl
Browse files

fw_cfg: Replace debug prints by tracepoints 



Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarBlue Swirl <blauwirbel@gmail.com>
parent 633f6502

hw/fw_cfg.c

+6 −19
Original line number Diff line number Diff line
@@ -26,19 +26,10 @@ 
#include "isa.h"

#include "fw_cfg.h"

#include "sysbus.h"

#include "trace.h"

#include "qemu/error-report.h"

#include "qemu/config-file.h"



/* debug firmware config */

//#define DEBUG_FW_CFG



#ifdef DEBUG_FW_CFG

#define FW_CFG_DPRINTF(fmt, ...)                        \

    do { printf("FW_CFG: " fmt , ## __VA_ARGS__); } while (0)

#else

#define FW_CFG_DPRINTF(fmt, ...)

#endif



#define FW_CFG_SIZE 2

#define FW_CFG_DATA_SIZE 1
@@ -213,7 +204,7 @@ static void fw_cfg_write(FWCfgState *s, uint8_t value) 
    int arch = !!(s->cur_entry & FW_CFG_ARCH_LOCAL);

    FWCfgEntry *e = &s->entries[arch][s->cur_entry & FW_CFG_ENTRY_MASK];



    FW_CFG_DPRINTF("write %d\n", value);

    trace_fw_cfg_write(s, value);



    if (s->cur_entry & FW_CFG_WRITE_CHANNEL && e->callback &&

        s->cur_offset < e->len) {
@@ -238,8 +229,7 @@ static int fw_cfg_select(FWCfgState *s, uint16_t key) 
        ret = 1;

    }



    FW_CFG_DPRINTF("select key %d (%sfound)\n", key, ret ? "" : "not ");



    trace_fw_cfg_select(s, key, ret);

    return ret;

}
@@ -254,8 +244,7 @@ static uint8_t fw_cfg_read(FWCfgState *s) 
    else

        ret = e->data[s->cur_offset++];



    FW_CFG_DPRINTF("read %d\n", ret);



    trace_fw_cfg_read(s, ret);

    return ret;

}
@@ -470,16 +459,14 @@ int fw_cfg_add_file(FWCfgState *s, const char *filename, uint8_t *data, 
            filename);

    for (i = 0; i < index; i++) {

        if (strcmp(s->files->f[index].name, s->files->f[i].name) == 0) {

            FW_CFG_DPRINTF("%s: skip duplicate: %s\n", __FUNCTION__,

                           s->files->f[index].name);

            trace_fw_cfg_add_file_dupe(s, s->files->f[index].name);

            return 1;

        }

    }



    s->files->f[index].size   = cpu_to_be32(len);

    s->files->f[index].select = cpu_to_be16(FW_CFG_FILE_FIRST + index);

    FW_CFG_DPRINTF("%s: #%d: %s (%d bytes)\n", __FUNCTION__,

                   index, s->files->f[index].name, len);

    trace_fw_cfg_add_file(s, index, s->files->f[index].name, len);



    s->files->count = cpu_to_be32(index+1);

    return 1;

trace-events

+7 −0
Original line number Diff line number Diff line
@@ -167,6 +167,13 @@ ecc_mem_readl_ecr1(uint32_t ret) "Read event count 2 %08x" 
ecc_diag_mem_writeb(uint64_t addr, uint32_t val) "Write diagnostic %"PRId64" = %02x"

ecc_diag_mem_readb(uint64_t addr, uint32_t ret) "Read diagnostic %"PRId64"= %02x"



# hw/fw_cfg.c

fw_cfg_write(void *s, uint8_t value) "%p %d"

fw_cfg_select(void *s, uint16_t key, int ret) "%p key %d = %d"

fw_cfg_read(void *s, uint8_t ret) "%p = %d"

fw_cfg_add_file_dupe(void *s, char *name) "%p %s"

fw_cfg_add_file(void *s, int index, char *name, uint32_t len) "%p #%d: %s (%d bytes)"



# hw/hd-geometry.c

hd_geometry_lchs_guess(void *bs, int cyls, int heads, int secs) "bs %p LCHS %d %d %d"

hd_geometry_guess(void *bs, uint32_t cyls, uint32_t heads, uint32_t secs, int trans) "bs %p CHS %u %u %u trans %d"