mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

blockdev: rename block_stream_cb to a generic block_job_cb

Browse Source 
Signed-off-by: Jeff Cody <jcody@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Jeff Cody 2012-09-27 13:29:14 -04:00 committed by Kevin Wolf
parent 747ff60263
commit 9abf2dbaf6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
blockdev.c
View File

@ -1070,12 +1070,12 @@ static QObject *qobject_from_block_job(BlockJob *job)
job->speed); job->speed);
} }
static void block_stream_cb(void *opaque, int ret) static void block_job_cb(void *opaque, int ret)
{ {
BlockDriverState *bs = opaque; BlockDriverState *bs = opaque;
QObject *obj; QObject *obj;
trace_block_stream_cb(bs, bs->job, ret); trace_block_job_cb(bs, bs->job, ret);
assert(bs->job); assert(bs->job);
obj = qobject_from_block_job(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, 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)) { if (error_is_set(&local_err)) {
error_propagate(errp, local_err); error_propagate(errp, local_err);
return; return;

2
trace-events
View File

@ -79,7 +79,7 @@ commit_start(void *bs, void *base, void *top, void *s, void *co, void *opaque) "
# blockdev.c # blockdev.c
qmp_block_job_cancel(void *job) "job %p" 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" qmp_block_stream(void *bs, void *job) "bs %p job %p"
# hw/virtio-blk.c # hw/virtio-blk.c