Commit 659f7f65 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by David Gibson
Browse files

prep: do not use CPU_LOG_IOPORT, convert to tracepoints 



These messages are disabled by default; a perfect usecase for tracepoints.
Convert them over.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 29f8dd66

hw/ppc/prep.c

+3 −27
Original line number Diff line number Diff line
@@ -42,11 +42,9 @@ 
#include "sysemu/arch_init.h"

#include "sysemu/qtest.h"

#include "exec/address-spaces.h"

#include "trace.h"

#include "elf.h"



//#define HARD_DEBUG_PPC_IO

//#define DEBUG_PPC_IO



/* SMP is not enabled, for now */

#define MAX_CPUS 1
@@ -57,26 +55,6 @@ 
#define KERNEL_LOAD_ADDR 0x01000000

#define INITRD_LOAD_ADDR 0x01800000



#if defined (HARD_DEBUG_PPC_IO) && !defined (DEBUG_PPC_IO)

#define DEBUG_PPC_IO

#endif



#if defined (HARD_DEBUG_PPC_IO)

#define PPC_IO_DPRINTF(fmt, ...)                         \

do {                                                     \

    if (qemu_loglevel_mask(CPU_LOG_IOPORT)) {            \

        qemu_log("%s: " fmt, __func__ , ## __VA_ARGS__); \

    } else {                                             \

        printf("%s : " fmt, __func__ , ## __VA_ARGS__);  \

    }                                                    \

} while (0)

#elif defined (DEBUG_PPC_IO)

#define PPC_IO_DPRINTF(fmt, ...) \

qemu_log_mask(CPU_LOG_IOPORT, fmt, ## __VA_ARGS__)

#else

#define PPC_IO_DPRINTF(fmt, ...) do { } while (0)

#endif



/* Constants for devices init */

static const int ide_iobase[2] = { 0x1f0, 0x170 };

static const int ide_iobase2[2] = { 0x3f6, 0x376 };
@@ -199,8 +177,7 @@ static void PREP_io_800_writeb (void *opaque, uint32_t addr, uint32_t val) 
{

    sysctrl_t *sysctrl = opaque;



    PPC_IO_DPRINTF("0x%08" PRIx32 " => 0x%02" PRIx32 "\n",

                   addr - PPC_IO_BASE, val);

    trace_prep_io_800_writeb(addr - PPC_IO_BASE, val);

    switch (addr) {

    case 0x0092:

        /* Special port 92 */
@@ -327,8 +304,7 @@ static uint32_t PREP_io_800_readb (void *opaque, uint32_t addr) 
        printf("ERROR: unaffected IO port: %04" PRIx32 " read\n", addr);

        break;

    }

    PPC_IO_DPRINTF("0x%08" PRIx32 " <= 0x%02" PRIx32 "\n",

                   addr - PPC_IO_BASE, retval);

    trace_prep_io_800_readb(addr - PPC_IO_BASE, retval);



    return retval;

}

trace-events

+4 −0
Original line number Diff line number Diff line
@@ -1383,6 +1383,10 @@ spapr_iommu_new_table(uint64_t liobn, void *tcet, void *table, int fd) "liobn=%" 
# 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)"



# hw/ppc/prep.c

prep_io_800_writeb(uint32_t addr, uint32_t val) "0x%08" PRIx32 " => 0x%02" PRIx32

prep_io_800_readb(uint32_t addr, uint32_t retval) "0x%08" PRIx32 " <= 0x%02" PRIx32



# util/hbitmap.c

hbitmap_iter_skip_words(const void *hb, void *hbi, uint64_t pos, unsigned long cur) "hb %p hbi %p pos %"PRId64" cur 0x%lx"

hbitmap_reset(void *hb, uint64_t start, uint64_t count, uint64_t sbit, uint64_t ebit) "hb %p items %"PRIu64",%"PRIu64" bits %"PRIu64"..%"PRIu64