Commit 7299e1a4 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Paolo Bonzini
Browse files

hw/i386/vmport: replace fprintf() by trace events or LOG_UNIMP 



Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20171215034356.4449-2-f4bug@amsat.org>
[Replace unknown command tracepoint with LOG_UNIMP, add
 generic tracepoint for vmport commands. - Paolo]
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 5fb3d632

hw/i386/trace-events

+4 −0
Original line number Diff line number Diff line
@@ -113,3 +113,7 @@ amdvi_mode_invalid(uint8_t level, uint64_t addr)"error: translation level 0x%"PR 
amdvi_page_fault(uint64_t addr) "error: page fault accessing guest physical address 0x%"PRIx64

amdvi_iotlb_hit(uint8_t bus, uint8_t slot, uint8_t func, uint64_t addr, uint64_t txaddr) "hit iotlb devid %02x:%02x.%x gpa 0x%"PRIx64" hpa 0x%"PRIx64

amdvi_translation_result(uint8_t bus, uint8_t slot, uint8_t func, uint64_t addr, uint64_t txaddr) "devid: %02x:%02x.%x gpa 0x%"PRIx64" hpa 0x%"PRIx64



# hw/i386/vmport.c

vmport_register(unsigned char command, void *func, void *opaque) "command: 0x%02x func: %p opaque: %p"

vmport_command(unsigned char command) "command: 0x%02x"

hw/i386/vmport.c

+5 −9
Original line number Diff line number Diff line
@@ -27,8 +27,7 @@ 
#include "hw/i386/pc.h"

#include "sysemu/hw_accel.h"

#include "hw/qdev.h"



/* #define VMPORT_DEBUG */

#include "trace.h"



#define VMPORT_CMD_GETVERSION 0x0a

#define VMPORT_CMD_GETRAMSIZE 0x14
@@ -54,6 +53,7 @@ void vmport_register(unsigned char command, VMPortReadFunc *func, void *opaque) 
        return;

    }



    trace_vmport_register(command, func, opaque);

    port_state->func[command] = func;

    port_state->opaque[command] = opaque;

}
@@ -76,13 +76,9 @@ static uint64_t vmport_ioport_read(void *opaque, hwaddr addr, 
    }



    command = env->regs[R_ECX];

    if (command >= VMPORT_ENTRIES) {

        return eax;

    }

    if (!s->func[command]) {

#ifdef VMPORT_DEBUG

        fprintf(stderr, "vmport: unknown command %x\n", command);

#endif

    trace_vmport_command(command);

    if (command >= VMPORT_ENTRIES || !s->func[command]) {

        qemu_log_mask(LOG_UNIMP, "vmport: unknown command %x\n", command);

        return eax;

    }