[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL v2 12/14] Blockjobs: Internalize user_pause logic
From: |
Jeff Cody |
Subject: |
[Qemu-block] [PULL v2 12/14] Blockjobs: Internalize user_pause logic |
Date: |
Tue, 1 Nov 2016 08:51:09 -0400 |
From: John Snow <address@hidden>
BlockJobs will begin hiding their state in preparation for some
refactorings anyway, so let's internalize the user_pause mechanism
instead of leaving it to callers to correctly manage.
Signed-off-by: John Snow <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Reviewed-by: Jeff Cody <address@hidden>
Message-id: address@hidden
Signed-off-by: Jeff Cody <address@hidden>
---
blockdev.c | 12 +++++-------
blockjob.c | 22 ++++++++++++++++++++--
include/block/blockjob.h | 26 ++++++++++++++++++++++++++
3 files changed, 51 insertions(+), 9 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index b6a74916..102ca9f 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -3610,7 +3610,7 @@ void qmp_block_job_cancel(const char *device,
force = false;
}
- if (job->user_paused && !force) {
+ if (block_job_user_paused(job) && !force) {
error_setg(errp, "The block job for device '%s' is currently paused",
device);
goto out;
@@ -3627,13 +3627,12 @@ void qmp_block_job_pause(const char *device, Error
**errp)
AioContext *aio_context;
BlockJob *job = find_block_job(device, &aio_context, errp);
- if (!job || job->user_paused) {
+ if (!job || block_job_user_paused(job)) {
return;
}
- job->user_paused = true;
trace_qmp_block_job_pause(job);
- block_job_pause(job);
+ block_job_user_pause(job);
aio_context_release(aio_context);
}
@@ -3642,14 +3641,13 @@ void qmp_block_job_resume(const char *device, Error
**errp)
AioContext *aio_context;
BlockJob *job = find_block_job(device, &aio_context, errp);
- if (!job || !job->user_paused) {
+ if (!job || !block_job_user_paused(job)) {
return;
}
- job->user_paused = false;
trace_qmp_block_job_resume(job);
block_job_iostatus_reset(job);
- block_job_resume(job);
+ block_job_user_resume(job);
aio_context_release(aio_context);
}
diff --git a/blockjob.c b/blockjob.c
index 309ef9a..d880ad2 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -373,11 +373,22 @@ void block_job_pause(BlockJob *job)
job->pause_count++;
}
+void block_job_user_pause(BlockJob *job)
+{
+ job->user_paused = true;
+ block_job_pause(job);
+}
+
static bool block_job_should_pause(BlockJob *job)
{
return job->pause_count > 0;
}
+bool block_job_user_paused(BlockJob *job)
+{
+ return job ? job->user_paused : 0;
+}
+
void coroutine_fn block_job_pause_point(BlockJob *job)
{
if (!block_job_should_pause(job)) {
@@ -414,6 +425,14 @@ void block_job_resume(BlockJob *job)
block_job_enter(job);
}
+void block_job_user_resume(BlockJob *job)
+{
+ if (job && job->user_paused && job->pause_count > 0) {
+ job->user_paused = false;
+ block_job_resume(job);
+ }
+}
+
void block_job_enter(BlockJob *job)
{
if (job->co && !job->busy) {
@@ -644,8 +663,7 @@ BlockErrorAction block_job_error_action(BlockJob *job,
BlockdevOnError on_err,
}
if (action == BLOCK_ERROR_ACTION_STOP) {
/* make the pause user visible, which will be resumed from QMP. */
- job->user_paused = true;
- block_job_pause(job);
+ block_job_user_pause(job);
block_job_iostatus_set_err(job, error);
}
return action;
diff --git a/include/block/blockjob.h b/include/block/blockjob.h
index c031fe7..d31ea43 100644
--- a/include/block/blockjob.h
+++ b/include/block/blockjob.h
@@ -379,6 +379,23 @@ void coroutine_fn block_job_pause_point(BlockJob *job);
void block_job_pause(BlockJob *job);
/**
+ * block_job_user_pause:
+ * @job: The job to be paused.
+ *
+ * Asynchronously pause the specified job.
+ * Do not allow a resume until a matching call to block_job_user_resume.
+ */
+void block_job_user_pause(BlockJob *job);
+
+/**
+ * block_job_paused:
+ * @job: The job to query.
+ *
+ * Returns true if the job is user-paused.
+ */
+bool block_job_user_paused(BlockJob *job);
+
+/**
* block_job_resume:
* @job: The job to be resumed.
*
@@ -387,6 +404,15 @@ void block_job_pause(BlockJob *job);
void block_job_resume(BlockJob *job);
/**
+ * block_job_user_resume:
+ * @job: The job to be resumed.
+ *
+ * Resume the specified job.
+ * Must be paired with a preceding block_job_user_pause.
+ */
+void block_job_user_resume(BlockJob *job);
+
+/**
* block_job_enter:
* @job: The job to enter.
*
--
2.7.4
- [Qemu-block] [PULL v2 01/14] qapi: add release designator to gluster logfile option, (continued)
- [Qemu-block] [PULL v2 01/14] qapi: add release designator to gluster logfile option, Jeff Cody, 2016/11/01
- [Qemu-block] [PULL v2 02/14] rbd: make the code more readable, Jeff Cody, 2016/11/01
- [Qemu-block] [PULL v2 03/14] block: add gluster ifdef guard checks for SEEK_DATA/SEEK_HOLE support, Jeff Cody, 2016/11/01
- [Qemu-block] [PULL v2 05/14] block: Turn on "unmap" in active commit, Jeff Cody, 2016/11/01
- [Qemu-block] [PULL v2 07/14] block/gluster: fix port type in the QAPI options list, Jeff Cody, 2016/11/01
- [Qemu-block] [PULL v2 06/14] block/gluster: improve defense over string to int conversion, Jeff Cody, 2016/11/01
- [Qemu-block] [PULL v2 08/14] blockjobs: hide internal jobs from management API, Jeff Cody, 2016/11/01
- [Qemu-block] [PULL v2 04/14] block/gluster: memory usage: use one glfs instance per volume, Jeff Cody, 2016/11/01
- [Qemu-block] [PULL v2 09/14] blockjobs: Allow creating internal jobs, Jeff Cody, 2016/11/01
- [Qemu-block] [PULL v2 10/14] Replication/Blockjobs: Create replication jobs as internal, Jeff Cody, 2016/11/01
- [Qemu-block] [PULL v2 12/14] Blockjobs: Internalize user_pause logic,
Jeff Cody <=
- [Qemu-block] [PULL v2 11/14] blockjob: centralize QMP event emissions, Jeff Cody, 2016/11/01
- [Qemu-block] [PULL v2 13/14] blockjobs: split interface into public/private, Part 1, Jeff Cody, 2016/11/01
- [Qemu-block] [PULL v2 14/14] blockjobs: fix documentation, Jeff Cody, 2016/11/01
- Re: [Qemu-block] [Qemu-devel] [PULL v2 00/14] Block patches for 2.8, no-reply, 2016/11/01
- Re: [Qemu-block] [PULL v2 00/14] Block patches for 2.8, Peter Maydell, 2016/11/01
- Re: [Qemu-block] [PULL v2 00/14] Block patches for 2.8, Stefan Hajnoczi, 2016/11/02