Revision c57c4658 dma-helpers.c

b/dma-helpers.c
9 9

  
10 10
#include "dma.h"
11 11
#include "block_int.h"
12
#include "trace.h"
12 13

  
13 14
void qemu_sglist_init(QEMUSGList *qsg, int alloc_hint)
14 15
{
......
83 84

  
84 85
static void dma_complete(DMAAIOCB *dbs, int ret)
85 86
{
87
    trace_dma_complete(dbs, ret, dbs->common.cb);
88

  
86 89
    dma_bdrv_unmap(dbs);
87 90
    if (dbs->common.cb) {
88 91
        dbs->common.cb(dbs->common.opaque, ret);
......
106 109
    target_phys_addr_t cur_addr, cur_len;
107 110
    void *mem;
108 111

  
112
    trace_dma_bdrv_cb(dbs, ret);
113

  
109 114
    dbs->acb = NULL;
110 115
    dbs->sector_num += dbs->iov.size / 512;
111 116
    dma_bdrv_unmap(dbs);
......
130 135
    }
131 136

  
132 137
    if (dbs->iov.size == 0) {
138
        trace_dma_map_wait(dbs);
133 139
        cpu_register_map_client(dbs, continue_after_map_failure);
134 140
        return;
135 141
    }
......
145 151
{
146 152
    DMAAIOCB *dbs = container_of(acb, DMAAIOCB, common);
147 153

  
154
    trace_dma_aio_cancel(dbs);
155

  
148 156
    if (dbs->acb) {
149 157
        BlockDriverAIOCB *acb = dbs->acb;
150 158
        dbs->acb = NULL;
......
168 176
{
169 177
    DMAAIOCB *dbs = qemu_aio_get(&dma_aio_pool, bs, cb, opaque);
170 178

  
179
    trace_dma_bdrv_io(dbs, bs, sector_num, to_dev);
180

  
171 181
    dbs->acb = NULL;
172 182
    dbs->bs = bs;
173 183
    dbs->sg = sg;

Also available in: Unified diff