Commit 1787efc3 authored by John Snow's avatar John Snow
Browse files

IDE: add tracing for data ports 



To be used sparingly, but still interesting in the case of small
firmwares designed to reproduce bugs in QEMU IDE.

Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Message-id: 20170901001502.29915-4-jsnow@redhat.com
Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
parent 335ca2f2

hw/ide/core.c

+11 −1
Original line number Diff line number Diff line
@@ -2259,6 +2259,8 @@ void ide_data_writew(void *opaque, uint32_t addr, uint32_t val) 
    IDEState *s = idebus_active_if(bus);

    uint8_t *p;



    trace_ide_data_writew(addr, val, bus, s);



    /* PIO data access allowed only when DRQ bit is set. The result of a write

     * during PIO out is indeterminate, just ignore it. */

    if (!(s->status & DRQ_STAT) || ide_is_pio_out(s)) {
@@ -2304,6 +2306,8 @@ uint32_t ide_data_readw(void *opaque, uint32_t addr) 
        s->status &= ~DRQ_STAT;

        s->end_transfer_func(s);

    }



    trace_ide_data_readw(addr, ret, bus, s);

    return ret;

}
@@ -2313,6 +2317,8 @@ void ide_data_writel(void *opaque, uint32_t addr, uint32_t val) 
    IDEState *s = idebus_active_if(bus);

    uint8_t *p;



    trace_ide_data_writel(addr, val, bus, s);



    /* PIO data access allowed only when DRQ bit is set. The result of a write

     * during PIO out is indeterminate, just ignore it. */

    if (!(s->status & DRQ_STAT) || ide_is_pio_out(s)) {
@@ -2343,7 +2349,8 @@ uint32_t ide_data_readl(void *opaque, uint32_t addr) 
    /* PIO data access allowed only when DRQ bit is set. The result of a read

     * during PIO in is indeterminate, return 0 and don't move forward. */

    if (!(s->status & DRQ_STAT) || !ide_is_pio_out(s)) {

        return 0;

        ret = 0;

        goto out;

    }



    p = s->data_ptr;
@@ -2358,6 +2365,9 @@ uint32_t ide_data_readl(void *opaque, uint32_t addr) 
        s->status &= ~DRQ_STAT;

        s->end_transfer_func(s);

    }



out:

    trace_ide_data_readl(addr, ret, bus, s);

    return ret;

}

hw/ide/trace-events

+5 −0
Original line number Diff line number Diff line
@@ -6,6 +6,11 @@ ide_ioport_read(uint32_t addr, const char *reg, uint32_t val, void *bus, void *s 
ide_ioport_write(uint32_t addr, const char *reg, uint32_t val, void *bus, void *s) "IDE PIO wr @ 0x%"PRIx32" (%s); val 0x%02"PRIx32"; bus %p IDEState %p"

ide_status_read(uint32_t addr, uint32_t val, void *bus, void *s)                   "IDE PIO rd @ 0x%"PRIx32" (Alt Status); val 0x%02"PRIx32"; bus %p; IDEState %p"

ide_cmd_write(uint32_t addr, uint32_t val, void *bus)                              "IDE PIO wr @ 0x%"PRIx32" (Device Control); val 0x%02"PRIx32"; bus %p"

# Warning: verbose

ide_data_readw(uint32_t addr, uint32_t val, void *bus, void *s)                    "IDE PIO rd @ 0x%"PRIx32" (Data: Word); val 0x%04"PRIx32"; bus %p; IDEState %p"

ide_data_writew(uint32_t addr, uint32_t val, void *bus, void *s)                   "IDE PIO wr @ 0x%"PRIx32" (Data: Word); val 0x%04"PRIx32"; bus %p; IDEState %p"

ide_data_readl(uint32_t addr, uint32_t val, void *bus, void *s)                    "IDE PIO rd @ 0x%"PRIx32" (Data: Long); val 0x%08"PRIx32"; bus %p; IDEState %p"

ide_data_writel(uint32_t addr, uint32_t val, void *bus, void *s)                   "IDE PIO wr @ 0x%"PRIx32" (Data: Long); val 0x%08"PRIx32"; bus %p; IDEState %p"

# misc

ide_exec_cmd(void *bus, void *state, uint32_t cmd) "IDE exec cmd: bus %p; state %p; cmd 0x%02x"

ide_cancel_dma_sync_buffered(void *fn, void *req) "invoking cb %p of buffered request %p with -ECANCELED"