OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

blockjob: move iostatus reset inside block_job_user_resume

Browse Source 
Outside blockjob.c, the block_job_iostatus_reset function is used once
in the monitor and once in BlockBackend.  When we introduce the block
job mutex, block_job_iostatus_reset's client is going to be the block
layer (for which blockjob.c will take the block job mutex) rather than
the monitor (which will take the block job mutex by itself).

The monitor's call to block_job_iostatus_reset from the monitor comes
just before the sole call to block_job_user_resume, so reset the
iostatus directly from block_job_iostatus_reset.  This will avoid
the need to introduce separate block_job_iostatus_reset and
block_job_iostatus_reset_locked APIs.

After making this change, move the function together with the others
that were moved in the previous patch.

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Message-id: 20170508141310.8674-7-pbonzini@redhat.com
Signed-off-by: Jeff Cody <jcody@redhat.com>
This commit is contained in:
Paolo Bonzini 2017-05-08 16:13:05 +02:00 committed by Jeff Cody
parent 88691b37f8
commit 2caf63a903
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
blockdev.c
View File

@ -3715,7 +3715,6 @@ void qmp_block_job_resume(const char *device, Error **errp)
} }
trace_qmp_block_job_resume(job); trace_qmp_block_job_resume(job);
block_job_iostatus_reset(job);
block_job_user_resume(job); block_job_user_resume(job);
aio_context_release(aio_context); aio_context_release(aio_context);
} }

11
blockjob.c
View File

@ -412,6 +412,7 @@ void block_job_user_resume(BlockJob *job)
{ {
if (job && job->user_paused && job->pause_count > 0) { if (job && job->user_paused && job->pause_count > 0) {
job->user_paused = false; job->user_paused = false;
block_job_iostatus_reset(job);
block_job_resume(job); block_job_resume(job);
} }
} }
@ -427,11 +428,6 @@ void block_job_cancel(BlockJob *job)
} }
} }
void block_job_iostatus_reset(BlockJob *job)
{
job->iostatus = BLOCK_DEVICE_IO_STATUS_OK;
}
static int block_job_finish_sync(BlockJob *job, static int block_job_finish_sync(BlockJob *job,
void (*finish)(BlockJob *, Error **errp), void (*finish)(BlockJob *, Error **errp),
Error **errp) Error **errp)
@ -767,6 +763,11 @@ void block_job_yield(BlockJob *job)
block_job_pause_point(job); block_job_pause_point(job);
} }
void block_job_iostatus_reset(BlockJob *job)
{
job->iostatus = BLOCK_DEVICE_IO_STATUS_OK;
}
void block_job_event_ready(BlockJob *job) void block_job_event_ready(BlockJob *job)
{ {
job->ready = true; job->ready = true;