Commit 0e168d35 authored by John Snow's avatar John Snow
Browse files

IDE: replace DEBUG_AIO with trace events 



Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20170901001502.29915-6-jsnow@redhat.com
[Edited enum conditional for Clang --js]
Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
parent 82a13ff8

hw/ide/atapi.c

+1 −4
Original line number Diff line number Diff line
@@ -416,10 +416,7 @@ static void ide_atapi_cmd_read_dma_cb(void *opaque, int ret) 
        s->io_buffer_size = n * 2048;

        data_offset = 0;

    }

#ifdef DEBUG_AIO

    printf("aio_read_cd: lba=%u n=%d\n", s->lba, n);

#endif



    trace_ide_atapi_cmd_read_dma_cb_aio(s, s->lba, n);

    s->bus->dma->iov.iov_base = (void *)(s->io_buffer + data_offset);

    s->bus->dma->iov.iov_len = n * ATAPI_SECTOR_SIZE;

    qemu_iovec_init_external(&s->bus->dma->qiov, &s->bus->dma->iov, 1);

hw/ide/core.c

+17 −7
Original line number Diff line number Diff line
@@ -58,6 +58,21 @@ static const int smart_attributes[][12] = { 
    { 190,  0x03, 0x00, 0x45, 0x45, 0x1f, 0x00, 0x1f, 0x1f, 0x00, 0x00, 0x32},

};



const char *IDE_DMA_CMD_lookup[IDE_DMA__COUNT] = {

    [IDE_DMA_READ] = "DMA READ",

    [IDE_DMA_WRITE] = "DMA WRITE",

    [IDE_DMA_TRIM] = "DMA TRIM",

    [IDE_DMA_ATAPI] = "DMA ATAPI"

};



static const char *IDE_DMA_CMD_str(enum ide_dma_cmd enval)

{

    if (enval >= IDE_DMA__BEGIN && enval < IDE_DMA__COUNT) {

        return IDE_DMA_CMD_lookup[enval];

    }

    return "DMA UNKNOWN CMD";

}



static void ide_dummy_transfer_stop(IDEState *s);



static void padstr(char *str, const char *src, int len)
@@ -860,10 +875,7 @@ static void ide_dma_cb(void *opaque, int ret) 
        goto eot;

    }



#ifdef DEBUG_AIO

    printf("ide_dma_cb: sector_num=%" PRId64 " n=%d, cmd_cmd=%d\n",

           sector_num, n, s->dma_cmd);

#endif

    trace_ide_dma_cb(s, sector_num, n, IDE_DMA_CMD_str(s->dma_cmd));



    if ((s->dma_cmd == IDE_DMA_READ || s->dma_cmd == IDE_DMA_WRITE) &&

        !ide_sect_range_ok(s, sector_num, n)) {
@@ -2391,9 +2403,7 @@ void ide_bus_reset(IDEBus *bus) 


    /* pending async DMA */

    if (bus->dma->aiocb) {

#ifdef DEBUG_AIO

        printf("aio_cancel\n");

#endif

        trace_ide_bus_reset_aio();

        blk_aio_cancel(bus->dma->aiocb);

        bus->dma->aiocb = NULL;

    }

hw/ide/trace-events

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ ide_cancel_dma_sync_remaining(void) "draining all remaining requests" 
ide_sector_read(int64_t sector_num, int nsectors) "sector=%"PRId64" nsectors=%d"

ide_sector_write(int64_t sector_num, int nsectors) "sector=%"PRId64" nsectors=%d"

ide_reset(void *s) "IDEstate %p"

ide_bus_reset_aio(void) "aio_cancel"

ide_dma_cb(void *s, int64_t sector_num, int n, const char *dma) "IDEState %p; sector_num=%"PRId64" n=%d cmd=%s"



# BMDMA HBAs:
@@ -51,5 +53,6 @@ ide_atapi_cmd_reply_end_new(void *s, int status) "IDEState: %p; new transfer sta 
ide_atapi_cmd_check_status(void *s) "IDEState: %p"

ide_atapi_cmd_read(void *s, const char *method, int lba, int nb_sectors) "IDEState: %p; read %s: LBA=%d nb_sectors=%d"

ide_atapi_cmd(void *s, uint8_t cmd) "IDEState: %p; cmd: 0x%02x"

ide_atapi_cmd_read_dma_cb_aio(void *s, int lba, int n) "IDEState: %p; aio read: lba=%d n=%d"

# Warning: Verbose

ide_atapi_cmd_packet(void *s, uint16_t limit, const char *packet) "IDEState: %p; limit=0x%x packet: %s"

include/hw/ide/internal.h

+5 −2
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
#include "block/scsi.h"



/* debug IDE devices */

//#define DEBUG_AIO

#define USE_DMA_CDROM



typedef struct IDEBus IDEBus;
@@ -333,12 +332,16 @@ struct unreported_events { 
};



enum ide_dma_cmd {

    IDE_DMA_READ,

    IDE_DMA__BEGIN = 0,

    IDE_DMA_READ = IDE_DMA__BEGIN,

    IDE_DMA_WRITE,

    IDE_DMA_TRIM,

    IDE_DMA_ATAPI,

    IDE_DMA__COUNT

};



extern const char *IDE_DMA_CMD_lookup[IDE_DMA__COUNT];



#define ide_cmd_is_read(s) \

	((s)->dma_cmd == IDE_DMA_READ)