summary refs log tree commit diff stats
path: root/blockdev.c
diff options
context:
space:
mode:
authorJeff Cody <jcody@redhat.com>2012-09-27 13:29:14 -0400
committerKevin Wolf <kwolf@redhat.com>2012-09-28 18:23:16 +0200
commit9abf2dbaf6ae990c498ec0245986bddcd6b013ea (patch)
tree7f4ed9ff68bfa3cf44bc26cbd64f2e59c06a7fde /blockdev.c
parent747ff602636fd83daae7ee4b1dd6e8d257a89fea (diff)
downloadfocaccia-qemu-9abf2dbaf6ae990c498ec0245986bddcd6b013ea.tar.gz
focaccia-qemu-9abf2dbaf6ae990c498ec0245986bddcd6b013ea.zip
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>
Diffstat (limited to 'blockdev.c')
-rw-r--r--blockdev.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/blockdev.c b/blockdev.c
index 0267fa30bf..f910ac5302 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;