[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 02/19] blockdev: rename block_stream_cb to a generic
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 02/19] blockdev: rename block_stream_cb to a generic block_job_cb |
Date: |
Fri, 28 Sep 2012 17:22:45 +0200 |
From: Jeff Cody <address@hidden>
Signed-off-by: Jeff Cody <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
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
- [Qemu-devel] [PULL for Kevin 00/19] Block job improvements part 1, Paolo Bonzini, 2012/09/28
- [Qemu-devel] [PATCH 01/19] qerror/block: introduce QERR_BLOCK_JOB_NOT_ACTIVE, Paolo Bonzini, 2012/09/28
- [Qemu-devel] [PATCH 02/19] blockdev: rename block_stream_cb to a generic block_job_cb,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 03/19] block: fix documentation of block_job_cancel_sync, Paolo Bonzini, 2012/09/28
- [Qemu-devel] [PATCH 04/19] block: move job APIs to separate files, Paolo Bonzini, 2012/09/28
- [Qemu-devel] [PATCH 06/19] qmp: add 'busy' member to BlockJobInfo, Paolo Bonzini, 2012/09/28
- [Qemu-devel] [PATCH 05/19] block: add block_job_query, Paolo Bonzini, 2012/09/28
- [Qemu-devel] [PATCH 09/19] qemu-iotests: add test for pausing a streaming operation, Paolo Bonzini, 2012/09/28
- [Qemu-devel] [PATCH 08/19] qmp: add block-job-pause and block-job-resume, Paolo Bonzini, 2012/09/28
- [Qemu-devel] [PATCH 07/19] block: add support for job pause/resume, Paolo Bonzini, 2012/09/28
- [Qemu-devel] [PATCH 10/19] block: rename block_job_complete to block_job_completed, Paolo Bonzini, 2012/09/28
- [Qemu-devel] [PATCH 11/19] iostatus: rename BlockErrorAction, BlockQMPEventAction, Paolo Bonzini, 2012/09/28
- [Qemu-devel] [PATCH 15/19] block: introduce block job error, Paolo Bonzini, 2012/09/28