[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 30/45] iostatus: forward block_job_iostatus_reset
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v2 30/45] iostatus: forward block_job_iostatus_reset to block job |
Date: |
Wed, 26 Sep 2012 17:56:36 +0200 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
block.c | 3 +++
blockjob.c | 3 +++
blockjob.h | 6 +++++-
3 file modificati, 11 inserzioni(+). 1 rimozione(-)
diff --git a/block.c b/block.c
index 074325d..0f57ec1 100644
--- a/block.c
+++ b/block.c
@@ -4162,6 +4162,9 @@ void bdrv_iostatus_reset(BlockDriverState *bs)
{
if (bdrv_iostatus_is_enabled(bs)) {
bs->iostatus = BLOCK_DEVICE_IO_STATUS_OK;
+ if (bs->job) {
+ block_job_iostatus_reset(bs->job);
+ }
}
}
diff --git a/blockjob.c b/blockjob.c
index 8d2687c..52d290b 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -142,6 +142,9 @@ bool block_job_is_cancelled(BlockJob *job)
void block_job_iostatus_reset(BlockJob *job)
{
job->iostatus = BLOCK_DEVICE_IO_STATUS_OK;
+ if (job->job_type->iostatus_reset) {
+ job->job_type->iostatus_reset(job);
+ }
}
struct BlockCancelData {
diff --git a/blockjob.h b/blockjob.h
index be37cc1..32bd793 100644
--- a/blockjob.h
+++ b/blockjob.h
@@ -42,6 +42,9 @@ typedef struct BlockJobType {
/** Optional callback for job types that support setting a speed limit */
void (*set_speed)(BlockJob *job, int64_t speed, Error **errp);
+ /** Optional callback for job types that need to forward I/O status reset
*/
+ void (*iostatus_reset)(BlockJob *job);
+
/**
* Optional callback for job types whose completion must be triggered
* manually.
@@ -254,7 +257,8 @@ int block_job_cancel_sync(BlockJob *job);
* block_job_iostatus_reset:
* @job: The job whose I/O status should be reset.
*
- * Reset I/O status on @job.
+ * Reset I/O status on @job and on BlockDriverState objects it uses,
+ * other than job->bs.
*/
void block_job_iostatus_reset(BlockJob *job);
--
1.7.12
- [Qemu-devel] [PATCH v2 35/45] add hierarchical bitmap data type and test cases, (continued)
- [Qemu-devel] [PATCH v2 35/45] add hierarchical bitmap data type and test cases, Paolo Bonzini, 2012/09/26
- [Qemu-devel] [PATCH v2 34/45] host-utils: add ffsl, Paolo Bonzini, 2012/09/26
- [Qemu-devel] [PATCH v2 45/45] mirror: support arbitrarily-sized iterations, Paolo Bonzini, 2012/09/26
- [Qemu-devel] [PATCH v2 21/45] block: add bdrv_open_backing_file, Paolo Bonzini, 2012/09/26
- [Qemu-devel] [PATCH v2 28/45] mirror: implement completion, Paolo Bonzini, 2012/09/26
- [Qemu-devel] [PATCH v2 15/45] stream: add on-error argument, Paolo Bonzini, 2012/09/26
- [Qemu-devel] [PATCH v2 30/45] iostatus: forward block_job_iostatus_reset to block job,
Paolo Bonzini <=
- [Qemu-devel] [PATCH v2 31/45] mirror: add support for on-source-error/on-target-error, Paolo Bonzini, 2012/09/26
- [Qemu-devel] [PATCH v2 29/45] qemu-iotests: add mirroring test case, Paolo Bonzini, 2012/09/26
- [Qemu-devel] [PATCH v2 25/45] block: introduce BLOCK_JOB_READY event, Paolo Bonzini, 2012/09/26
- [Qemu-devel] [PATCH v2 40/45] block: allow customizing the granularity of the dirty bitmap, Paolo Bonzini, 2012/09/26
- [Qemu-devel] [PATCH v2 33/45] qemu-iotests: add testcases for mirroring on-source-error/on-target-error, Paolo Bonzini, 2012/09/26
- Re: [Qemu-devel] [PATCH v2 00/45] Block job improvements for 1.3, Kevin Wolf, 2012/09/27