[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 1/5] blockjob: move iostatus reset out of block_j
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH v4 1/5] blockjob: move iostatus reset out of block_job_enter() |
Date: |
Tue, 14 Jun 2016 19:17:04 +0100 |
The QMP block-job-resume command and cancellation may want to reset the
job's iostatus. The next patches add a user who does not want to reset
iostatus so move it up to block_job_enter() callers.
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
blockdev.c | 1 +
blockjob.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/blockdev.c b/blockdev.c
index 7fd515a..19b963c 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -3799,6 +3799,7 @@ void qmp_block_job_resume(const char *device, Error
**errp)
job->user_paused = false;
trace_qmp_block_job_resume(job);
+ block_job_iostatus_reset(job);
block_job_resume(job);
aio_context_release(aio_context);
}
diff --git a/blockjob.c b/blockjob.c
index c095cc5..463bccf 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -269,7 +269,6 @@ void block_job_resume(BlockJob *job)
void block_job_enter(BlockJob *job)
{
- block_job_iostatus_reset(job);
if (job->co && !job->busy) {
qemu_coroutine_enter(job->co, NULL);
}
@@ -278,6 +277,7 @@ void block_job_enter(BlockJob *job)
void block_job_cancel(BlockJob *job)
{
job->cancelled = true;
+ block_job_iostatus_reset(job);
block_job_enter(job);
}
--
2.5.5
- [Qemu-devel] [PATCH v4 0/5] blockjob: AioContext change support for mirror and backup, Stefan Hajnoczi, 2016/06/14
- [Qemu-devel] [PATCH v4 2/5] blockjob: add pause points, Stefan Hajnoczi, 2016/06/14
- [Qemu-devel] [PATCH v4 1/5] blockjob: move iostatus reset out of block_job_enter(),
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH v4 5/5] backup: follow AioContext change gracefully, Stefan Hajnoczi, 2016/06/14
- [Qemu-devel] [PATCH v4 3/5] blockjob: add AioContext attached callback, Stefan Hajnoczi, 2016/06/14
- Re: [Qemu-devel] [PATCH v4 0/5] blockjob: AioContext change support for mirror and backup, Jason J. Herne, 2016/06/14
- Re: [Qemu-devel] [PATCH v4 0/5] blockjob: AioContext change support for mirror and backup, Paolo Bonzini, 2016/06/15