Oops I sent the wrong file :(
On Fri, Dec 15, 2017 at 12:30 AM, Philippe Mathieu-Daudé
<f4...@amsat.org> wrote:
> Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org>
> ---
> hw/i386/vmport.c | 8 +++-----
> hw/i386/trace-events | 4 ++++
> 2 files changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/hw/i386/vmport.c b/hw/i386/vmport.c
> index eb880c6def..b5585a009a 100644
> --- a/hw/i386/vmport.c
> +++ b/hw/i386/vmport.c
> @@ -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;
> }
> @@ -80,9 +80,7 @@ static uint64_t vmport_ioport_read(void *opaque, hwaddr
> addr,
> return eax;
> }
> if (!s->func[command]) {
> -#ifdef VMPORT_DEBUG
> - fprintf(stderr, "vmport: unknown command %x\n", command);
> -#endif
> + trace_vmport_ioport_read_unknown_command(command, addr);
> return eax;
> }
>
> diff --git a/hw/i386/trace-events b/hw/i386/trace-events
> index d43b4b6cd3..f0522ea5e5 100644
> --- a/hw/i386/trace-events
> +++ b/hw/i386/trace-events
> @@ -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_ioport_read_unknown_command(unsigned char command, hwaddr addr)
> "unknown command: 0x%02x addr: 0x" HWADDR_PRIx
a '%' is missing here: 0x%" HWADDR_PRIx
-vmport_ioport_read_unknown_command(unsigned char command, hwaddr
addr) "unknown command: 0x%02x addr: 0x" HWADDR_PRIx
+vmport_ioport_read_unknown_command(unsigned char command, hwaddr
addr) "unknown command: 0x%02x addr: 0x%" HWADDR_PRIx
> --
> 2.15.1
>
