Commit 06e35065 authored by John Snow's avatar John Snow
Browse files

ahci: make port write traces more descriptive 



Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20180531222835.16558-8-jsnow@redhat.com
[Changed format specifier. --js]
Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
parent f647f458

hw/ide/ahci.c

+7 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include "hw/pci/pci.h"



#include "qemu/error-report.h"

#include "qemu/log.h"

#include "sysemu/block-backend.h"

#include "sysemu/dma.h"

#include "hw/ide/internal.h"
@@ -284,8 +285,8 @@ static void ahci_port_write(AHCIState *s, int port, int offset, uint32_t val) 
    AHCIPortRegs *pr = &s->dev[port].port_regs;

    enum AHCIPortReg regnum = offset / sizeof(uint32_t);

    assert(regnum < (AHCI_PORT_ADDR_OFFSET_LEN / sizeof(uint32_t)));

    trace_ahci_port_write(s, port, AHCIPortReg_lookup[regnum], offset, val);



    trace_ahci_port_write(s, port, offset, val);

    switch (regnum) {

    case AHCI_PORT_REG_LST_ADDR:

        pr->lst_addr = val;
@@ -355,6 +356,11 @@ static void ahci_port_write(AHCIState *s, int port, int offset, uint32_t val) 
        check_cmd(s, port);

        break;

    default:

        trace_ahci_port_write_unimpl(s, port, AHCIPortReg_lookup[regnum],

                                     offset, val);

        qemu_log_mask(LOG_UNIMP, "Attempted write to unimplemented register: "

                      "AHCI port %d register %s, offset 0x%x: 0x%"PRIx32,

                      port, AHCIPortReg_lookup[regnum], offset, val);

        break;

    }

}

hw/ide/trace-events

+2 −1
Original line number Diff line number Diff line
@@ -69,7 +69,8 @@ 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"

ahci_trigger_irq(void *s, int port, const char *name, uint32_t val, uint32_t old, uint32_t new, uint32_t effective) "ahci(%p)[%d]: trigger irq +%s (0x%08x); irqstat: 0x%08x --> 0x%08x; effective: 0x%08x"

ahci_port_write(void *s, int port, int offset, uint32_t val) "ahci(%p)[%d]: port write @ 0x%x: 0x%08x"

ahci_port_write(void *s, int port, const char *reg, int offset, uint32_t val) "ahci(%p)[%d]: port write [reg:%s] @ 0x%x: 0x%08x"

ahci_port_write_unimpl(void *s, int port, const char *reg, int offset, uint32_t val) "ahci(%p)[%d]: unimplemented port write [reg:%s] @ 0x%x: 0x%08x"

ahci_mem_read_32(void *s, uint64_t addr, uint32_t val) "ahci(%p): mem read @ 0x%"PRIx64": 0x%08x"

ahci_mem_read(void *s, unsigned size, uint64_t addr, uint64_t val) "ahci(%p): read%u @ 0x%"PRIx64": 0x%016"PRIx64

ahci_mem_write(void *s, unsigned size, uint64_t addr, uint64_t val) "ahci(%p): write%u @ 0x%"PRIx64": 0x%016"PRIx64