yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
26ba25
From 1680cb0e35f1a465feb93ade536c630f62ef23be Mon Sep 17 00:00:00 2001
26ba25
From: Kevin Wolf <kwolf@redhat.com>
26ba25
Date: Tue, 26 Jun 2018 09:48:20 +0200
26ba25
Subject: [PATCH 112/268] job: Move job_finish_sync() to Job
26ba25
26ba25
RH-Author: Kevin Wolf <kwolf@redhat.com>
26ba25
Message-id: <20180626094856.6924-38-kwolf@redhat.com>
26ba25
Patchwork-id: 81076
26ba25
O-Subject: [RHV-7.6 qemu-kvm-rhev PATCH v2 37/73] job: Move job_finish_sync() to Job
26ba25
Bugzilla: 1513543
26ba25
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
26ba25
RH-Acked-by: Max Reitz <mreitz@redhat.com>
26ba25
RH-Acked-by: Fam Zheng <famz@redhat.com>
26ba25
26ba25
block_job_finish_sync() doesn't contain anything block job specific any
26ba25
more, so it can be moved to Job.
26ba25
26ba25
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
26ba25
Reviewed-by: Max Reitz <mreitz@redhat.com>
26ba25
(cherry picked from commit 6a74c075aca731e7e945201a4ae2336b8e328433)
26ba25
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
26ba25
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
26ba25
---
26ba25
 block/commit.c     |  6 +++---
26ba25
 blockjob.c         | 55 +++++++++---------------------------------------------
26ba25
 include/qemu/job.h |  9 +++++++++
26ba25
 job.c              | 28 +++++++++++++++++++++++++++
26ba25
 4 files changed, 49 insertions(+), 49 deletions(-)
26ba25
26ba25
diff --git a/block/commit.c b/block/commit.c
26ba25
index 02a8af9..40d97a3 100644
26ba25
--- a/block/commit.c
26ba25
+++ b/block/commit.c
26ba25
@@ -112,9 +112,9 @@ static void commit_complete(Job *job, void *opaque)
26ba25
     blk_unref(s->top);
26ba25
 
26ba25
     /* If there is more than one reference to the job (e.g. if called from
26ba25
-     * block_job_finish_sync()), block_job_completed() won't free it and
26ba25
-     * therefore the blockers on the intermediate nodes remain. This would
26ba25
-     * cause bdrv_set_backing_hd() to fail. */
26ba25
+     * job_finish_sync()), block_job_completed() won't free it and therefore
26ba25
+     * the blockers on the intermediate nodes remain. This would cause
26ba25
+     * bdrv_set_backing_hd() to fail. */
26ba25
     block_job_remove_all_bdrv(bjob);
26ba25
 
26ba25
     block_job_completed(&s->common, ret);
26ba25
diff --git a/blockjob.c b/blockjob.c
26ba25
index 0ca7672..1ed3e9c 100644
26ba25
--- a/blockjob.c
26ba25
+++ b/blockjob.c
26ba25
@@ -307,40 +307,6 @@ static int block_job_txn_apply(BlockJobTxn *txn, int fn(BlockJob *), bool lock)
26ba25
     return rc;
26ba25
 }
26ba25
 
26ba25
-static int block_job_finish_sync(BlockJob *job,
26ba25
-                                 void (*finish)(BlockJob *, Error **errp),
26ba25
-                                 Error **errp)
26ba25
-{
26ba25
-    Error *local_err = NULL;
26ba25
-    int ret;
26ba25
-
26ba25
-    assert(blk_bs(job->blk)->job == job);
26ba25
-
26ba25
-    job_ref(&job->job);
26ba25
-
26ba25
-    if (finish) {
26ba25
-        finish(job, &local_err);
26ba25
-    }
26ba25
-    if (local_err) {
26ba25
-        error_propagate(errp, local_err);
26ba25
-        job_unref(&job->job);
26ba25
-        return -EBUSY;
26ba25
-    }
26ba25
-    /* job_drain calls job_enter, and it should be enough to induce progress
26ba25
-     * until the job completes or moves to the main thread.
26ba25
-    */
26ba25
-    while (!job->job.deferred_to_main_loop && !job_is_completed(&job->job)) {
26ba25
-        job_drain(&job->job);
26ba25
-    }
26ba25
-    while (!job_is_completed(&job->job)) {
26ba25
-        aio_poll(qemu_get_aio_context(), true);
26ba25
-    }
26ba25
-    ret = (job_is_cancelled(&job->job) && job->job.ret == 0)
26ba25
-          ? -ECANCELED : job->job.ret;
26ba25
-    job_unref(&job->job);
26ba25
-    return ret;
26ba25
-}
26ba25
-
26ba25
 static void block_job_completed_txn_abort(BlockJob *job)
26ba25
 {
26ba25
     AioContext *ctx;
26ba25
@@ -375,7 +341,7 @@ static void block_job_completed_txn_abort(BlockJob *job)
26ba25
         ctx = blk_get_aio_context(other_job->blk);
26ba25
         if (!job_is_completed(&other_job->job)) {
26ba25
             assert(job_is_cancelled(&other_job->job));
26ba25
-            block_job_finish_sync(other_job, NULL, NULL);
26ba25
+            job_finish_sync(&other_job->job, NULL, NULL);
26ba25
         }
26ba25
         job_finalize_single(&other_job->job);
26ba25
         aio_context_release(ctx);
26ba25
@@ -528,16 +494,18 @@ void block_job_user_cancel(BlockJob *job, bool force, Error **errp)
26ba25
 }
26ba25
 
26ba25
 /* A wrapper around block_job_cancel() taking an Error ** parameter so it may be
26ba25
- * used with block_job_finish_sync() without the need for (rather nasty)
26ba25
- * function pointer casts there. */
26ba25
-static void block_job_cancel_err(BlockJob *job, Error **errp)
26ba25
+ * used with job_finish_sync() without the need for (rather nasty) function
26ba25
+ * pointer casts there. */
26ba25
+static void block_job_cancel_err(Job *job, Error **errp)
26ba25
 {
26ba25
-    block_job_cancel(job, false);
26ba25
+    BlockJob *bjob = container_of(job, BlockJob, job);
26ba25
+    assert(is_block_job(job));
26ba25
+    block_job_cancel(bjob, false);
26ba25
 }
26ba25
 
26ba25
 int block_job_cancel_sync(BlockJob *job)
26ba25
 {
26ba25
-    return block_job_finish_sync(job, &block_job_cancel_err, NULL);
26ba25
+    return job_finish_sync(&job->job, &block_job_cancel_err, NULL);
26ba25
 }
26ba25
 
26ba25
 void block_job_cancel_sync_all(void)
26ba25
@@ -553,14 +521,9 @@ void block_job_cancel_sync_all(void)
26ba25
     }
26ba25
 }
26ba25
 
26ba25
-static void block_job_complete(BlockJob *job, Error **errp)
26ba25
-{
26ba25
-    job_complete(&job->job, errp);
26ba25
-}
26ba25
-
26ba25
 int block_job_complete_sync(BlockJob *job, Error **errp)
26ba25
 {
26ba25
-    return block_job_finish_sync(job, &block_job_complete, errp);
26ba25
+    return job_finish_sync(&job->job, job_complete, errp);
26ba25
 }
26ba25
 
26ba25
 void block_job_progress_update(BlockJob *job, uint64_t done)
26ba25
diff --git a/include/qemu/job.h b/include/qemu/job.h
26ba25
index 8f7f71a..17e2cec 100644
26ba25
--- a/include/qemu/job.h
26ba25
+++ b/include/qemu/job.h
26ba25
@@ -389,6 +389,15 @@ typedef void JobDeferToMainLoopFn(Job *job, void *opaque);
26ba25
  */
26ba25
 void job_defer_to_main_loop(Job *job, JobDeferToMainLoopFn *fn, void *opaque);
26ba25
 
26ba25
+/**
26ba25
+ * Synchronously finishes the given @job. If @finish is given, it is called to
26ba25
+ * trigger completion or cancellation of the job.
26ba25
+ *
26ba25
+ * Returns 0 if the job is successfully completed, -ECANCELED if the job was
26ba25
+ * cancelled before completing, and -errno in other error cases.
26ba25
+ */
26ba25
+int job_finish_sync(Job *job, void (*finish)(Job *, Error **errp), Error **errp);
26ba25
+
26ba25
 /* TODO To be removed from the public interface */
26ba25
 void job_state_transition(Job *job, JobStatus s1);
26ba25
 void coroutine_fn job_do_yield(Job *job, uint64_t ns);
26ba25
diff --git a/job.c b/job.c
26ba25
index 8ceac0b..aa74b4c 100644
26ba25
--- a/job.c
26ba25
+++ b/job.c
26ba25
@@ -603,3 +603,31 @@ void job_defer_to_main_loop(Job *job, JobDeferToMainLoopFn *fn, void *opaque)
26ba25
     aio_bh_schedule_oneshot(qemu_get_aio_context(),
26ba25
                             job_defer_to_main_loop_bh, data);
26ba25
 }
26ba25
+
26ba25
+int job_finish_sync(Job *job, void (*finish)(Job *, Error **errp), Error **errp)
26ba25
+{
26ba25
+    Error *local_err = NULL;
26ba25
+    int ret;
26ba25
+
26ba25
+    job_ref(job);
26ba25
+
26ba25
+    if (finish) {
26ba25
+        finish(job, &local_err);
26ba25
+    }
26ba25
+    if (local_err) {
26ba25
+        error_propagate(errp, local_err);
26ba25
+        job_unref(job);
26ba25
+        return -EBUSY;
26ba25
+    }
26ba25
+    /* job_drain calls job_enter, and it should be enough to induce progress
26ba25
+     * until the job completes or moves to the main thread. */
26ba25
+    while (!job->deferred_to_main_loop && !job_is_completed(job)) {
26ba25
+        job_drain(job);
26ba25
+    }
26ba25
+    while (!job_is_completed(job)) {
26ba25
+        aio_poll(qemu_get_aio_context(), true);
26ba25
+    }
26ba25
+    ret = (job_is_cancelled(job) && job->ret == 0) ? -ECANCELED : job->ret;
26ba25
+    job_unref(job);
26ba25
+    return ret;
26ba25
+}
26ba25
-- 
26ba25
1.8.3.1
26ba25