diff options
| author | Jeff Cody <jcody@redhat.com> | 2012-09-27 13:29:14 -0400 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2012-09-28 18:23:16 +0200 |
| commit | 9abf2dbaf6ae990c498ec0245986bddcd6b013ea (patch) | |
| tree | 7f4ed9ff68bfa3cf44bc26cbd64f2e59c06a7fde | |
| parent | 747ff602636fd83daae7ee4b1dd6e8d257a89fea (diff) | |
| download | migration-9abf2dbaf6ae990c498ec0245986bddcd6b013ea.tar.gz | |
blockdev: rename block_stream_cb to a generic block_job_cb
Signed-off-by: Jeff Cody <jcody@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | blockdev.c | 6 | ||||
| -rw-r--r-- | trace-events | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/blockdev.c b/blockdev.c index 0267fa30bfb..f910ac5302b 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1070,12 +1070,12 @@ static QObject *qobject_from_block_job(BlockJob *job) job->speed); } -static void block_stream_cb(void *opaque, int ret) +static void block_job_cb(void *opaque, int ret) { BlockDriverState *bs = opaque; QObject *obj; - trace_block_stream_cb(bs, bs->job, ret); + trace_block_job_cb(bs, bs->job, ret); assert(bs->job); obj = qobject_from_block_job(bs->job); @@ -1117,7 +1117,7 @@ void qmp_block_stream(const char *device, bool has_base, } stream_start(bs, base_bs, base, has_speed ? speed : 0, - block_stream_cb, bs, &local_err); + block_job_cb, bs, &local_err); if (error_is_set(&local_err)) { error_propagate(errp, local_err); return; diff --git a/trace-events b/trace-events index dbc30072197..29771a7b476 100644 --- a/trace-events +++ b/trace-events @@ -79,7 +79,7 @@ commit_start(void *bs, void *base, void *top, void *s, void *co, void *opaque) " # blockdev.c qmp_block_job_cancel(void *job) "job %p" -block_stream_cb(void *bs, void *job, int ret) "bs %p job %p ret %d" +block_job_cb(void *bs, void *job, int ret) "bs %p job %p ret %d" qmp_block_stream(void *bs, void *job) "bs %p job %p" # hw/virtio-blk.c |