[Qemu-devel] [PATCH v2 02/45] blockdev: rename block_stream_cb to a generic block_job_cb

[Paolo Bonzini]

From: Jeff Cody <jc...@redhat.com>

Signed-off-by: Jeff Cody <jc...@redhat.com>
---
        v1->v2: now synced with Jeff's live commit patch, and moved towards
        the beginning of the series to minimize conflicts

 blockdev.c   | 6 +++---
 trace-events | 2 +-
 2 file modificati, 4 inserzioni(+), 4 rimozioni(-)

diff --git a/blockdev.c b/blockdev.c
index de5457d..fa338fb 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -1065,12 +1065,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);
@@ -1112,7 +1112,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 f5b5097..e90de71 100644
--- a/trace-events
+++ b/trace-events
@@ -77,7 +77,7 @@ stream_start(void *bs, void *base, void *s, void *co, void 
*opaque) "bs %p base
 
 # 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
-- 
1.7.12