[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 12/15] blockjob: move iostatus reset out of block
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH v3 12/15] blockjob: move iostatus reset out of block_job_enter() |
Date: |
Mon, 13 Jun 2016 18:05:32 +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 v3 01/15] translate-all.c: Don't pass puc, locked to tb_invalidate_phys_page(), (continued)
- [Qemu-devel] [PATCH v3 01/15] translate-all.c: Don't pass puc, locked to tb_invalidate_phys_page(), Stefan Hajnoczi, 2016/06/13
- [Qemu-devel] [PATCH v3 02/15] user-exec: Push resume-from-signal code out to handle_cpu_signal(), Stefan Hajnoczi, 2016/06/13
- [Qemu-devel] [PATCH v3 03/15] cpu-exec: Rename cpu_resume_from_signal() to cpu_loop_exit_noexc(), Stefan Hajnoczi, 2016/06/13
- [Qemu-devel] [PATCH v3 04/15] user-exec: Don't reextract sigmask from usercontext pointer, Stefan Hajnoczi, 2016/06/13
- [Qemu-devel] [PATCH v3 05/15] target-i386: Add comment about do_interrupt_user() next_eip argument, Stefan Hajnoczi, 2016/06/13
- [Qemu-devel] [PATCH v3 06/15] target-i386: Move user-mode exception actions out of user-exec.c, Stefan Hajnoczi, 2016/06/13
- [Qemu-devel] [PATCH v3 08/15] ui: fix regression in printing VNC host/port on startup, Stefan Hajnoczi, 2016/06/13
- [Qemu-devel] [PATCH v3 07/15] vnc: drop unused depth arg for set_pixel_format, Stefan Hajnoczi, 2016/06/13
- [Qemu-devel] [PATCH v3 09/15] gtk: fix vte version check, Stefan Hajnoczi, 2016/06/13
- [Qemu-devel] [PATCH v3 10/15] ui/console-gl: Add support for big endian display surfaces, Stefan Hajnoczi, 2016/06/13
- [Qemu-devel] [PATCH v3 12/15] blockjob: move iostatus reset out of block_job_enter(),
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH v3 11/15] console: ignore ui_info updates which don't actually update something, Stefan Hajnoczi, 2016/06/13
- [Qemu-devel] [PATCH v3 13/15] blockjob: add pause points, Stefan Hajnoczi, 2016/06/13
- [Qemu-devel] [PATCH v3 14/15] blockjob: add AioContext attach/detach callbacks, Stefan Hajnoczi, 2016/06/13
- [Qemu-devel] [PATCH v3 15/15] mirror: follow AioContext change gracefully, Stefan Hajnoczi, 2016/06/13
- Re: [Qemu-devel] [PATCH v3 00/15] mirror: follow AioContext change gracefully, Stefan Hajnoczi, 2016/06/13
- Re: [Qemu-devel] [PATCH v3 00/15] mirror: follow AioContext change gracefully, Fam Zheng, 2016/06/14