[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 13/16] iostatus: forward block_job_iostatus_reset
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v3 13/16] iostatus: forward block_job_iostatus_reset to block job |
Date: |
Thu, 18 Oct 2012 16:49:27 +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 b167f61..3e76322 100644
--- a/block.c
+++ b/block.c
@@ -4319,6 +4319,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 fbb7e1c..cda12c6 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 fb2392e..3792b73 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.
@@ -253,7 +256,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.1
- [Qemu-devel] [PATCH v3 02/16] block: add bdrv_query_stats, (continued)
- [Qemu-devel] [PATCH v3 02/16] block: add bdrv_query_stats, Paolo Bonzini, 2012/10/18
- [Qemu-devel] [PATCH v3 03/16] block: add bdrv_open_backing_file, Paolo Bonzini, 2012/10/18
- [Qemu-devel] [PATCH v3 04/16] block: introduce new dirty bitmap functionality, Paolo Bonzini, 2012/10/18
- [Qemu-devel] [PATCH v3 05/16] block: export dirty bitmap information in query-block, Paolo Bonzini, 2012/10/18
- [Qemu-devel] [PATCH v3 06/16] block: rename block_job_complete to block_job_completed, Paolo Bonzini, 2012/10/18
- [Qemu-devel] [PATCH v3 07/16] block: add block-job-complete, Paolo Bonzini, 2012/10/18
- [Qemu-devel] [PATCH v3 08/16] block: introduce BLOCK_JOB_READY event, Paolo Bonzini, 2012/10/18
- [Qemu-devel] [PATCH v3 09/16] mirror: introduce mirror job, Paolo Bonzini, 2012/10/18
- [Qemu-devel] [PATCH v3 13/16] iostatus: forward block_job_iostatus_reset to block job,
Paolo Bonzini <=
- [Qemu-devel] [PATCH v3 14/16] mirror: add support for on-source-error/on-target-error, Paolo Bonzini, 2012/10/18
- [Qemu-devel] [PATCH v3 15/16] qmp: add pull_event function, Paolo Bonzini, 2012/10/18
- [Qemu-devel] [PATCH v3 12/16] qemu-iotests: add mirroring test case, Paolo Bonzini, 2012/10/18
- Re: [Qemu-devel] [PATCH v3 12/16] qemu-iotests: add mirroring test case, Kevin Wolf, 2012/10/19
- Re: [Qemu-devel] [PATCH v3 12/16] qemu-iotests: add mirroring test case, Paolo Bonzini, 2012/10/20
- Re: [Qemu-devel] [PATCH v3 12/16] qemu-iotests: add mirroring test case, Kevin Wolf, 2012/10/22
- Re: [Qemu-devel] [PATCH v3 12/16] qemu-iotests: add mirroring test case, Paolo Bonzini, 2012/10/22
- [Qemu-devel] [PATCH v4 12/16] qemu-iotests: add mirroring test case, Paolo Bonzini, 2012/10/23
- [Qemu-devel] [PATCH v4 16/16] qemu-iotests: add testcases for mirroring on-source-error/on-target-error, Paolo Bonzini, 2012/10/23
- Re: [Qemu-devel] [PATCH v3 12/16] qemu-iotests: add mirroring test case, Kevin Wolf, 2012/10/19