Hi John,
On 05/25/2018 08:54 PM, John Snow wrote:
> A trace is added to let us watch unimplemented registers specifically,
> as these are more likely to cause us trouble. Otherwise, the port read
> traces now tell us what register is getting hit, which is nicer.
>
> Signed-off-by: John Snow <js...@redhat.com>
> ---
> hw/ide/ahci.c | 5 +++--
> hw/ide/trace-events | 3 ++-
> 2 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
> index 5187bf34ad..57c80a2fe9 100644
> --- a/hw/ide/ahci.c
> +++ b/hw/ide/ahci.c
> @@ -46,7 +46,6 @@ static bool ahci_map_fis_address(AHCIDevice *ad);
> static void ahci_unmap_clb_address(AHCIDevice *ad);
> static void ahci_unmap_fis_address(AHCIDevice *ad);
>
> -__attribute__((__unused__)) /* TODO */
> static const char *AHCIPortReg_lookup[AHCI_PORT_REG__COUNT] = {
> [AHCI_PORT_REG_LST_ADDR] = "PxCLB",
> [AHCI_PORT_REG_LST_ADDR_HI] = "PxCLBU",
> @@ -149,10 +148,12 @@ static uint32_t ahci_port_read(AHCIState *s, int port,
> int offset)
> val = pr->cmd_issue;
> break;
> default:
> + trace_ahci_port_read_unimpl(s, port, AHCIPortReg_lookup[regnum],
> + offset);
I personally prefer qemu_log_mask(LOG_UNIMP) here.
Rational is when trying firmware, one might want to know which
unimplemented features access the firmware, without having to dig into
trace events, and the "-d unimp" command line option just works.
(same apply for the write() function later in this series).
> val = 0;
> }
>
> - trace_ahci_port_read(s, port, offset, val);
> + trace_ahci_port_read(s, port, AHCIPortReg_lookup[regnum], offset, val);
> return val;
> }
>
> diff --git a/hw/ide/trace-events b/hw/ide/trace-events
> index 5c0e59ec42..ffde28615f 100644
> --- a/hw/ide/trace-events
> +++ b/hw/ide/trace-events
> @@ -63,7 +63,8 @@ ide_atapi_cmd_read_dma_cb_aio(void *s, int lba, int n)
> "IDEState: %p; aio read:
> ide_atapi_cmd_packet(void *s, uint16_t limit, const char *packet) "IDEState:
> %p; limit=0x%x packet: %s"
>
> # hw/ide/ahci.c
> -ahci_port_read(void *s, int port, int offset, uint32_t ret) "ahci(%p)[%d]:
> port read @ 0x%x: 0x%08x"
> +ahci_port_read(void *s, int port, const char *reg, int offset, uint32_t ret)
> "ahci(%p)[%d]: port read [reg:%s] @ 0x%x: 0x%08x"
> +ahci_port_read_unimpl(void *s, int port, const char *reg, int offset)
> "ahci(%p)[%d]: unimplemented port read [reg:%s] @ 0x%x"
> ahci_irq_raise(void *s) "ahci(%p): raise irq"
> ahci_irq_lower(void *s) "ahci(%p): lower irq"
> ahci_check_irq(void *s, uint32_t old, uint32_t new) "ahci(%p): check irq
> 0x%08x --> 0x%08x"
>
