26ba25
From 0d87cf6bb623f8f1d0d7ffb30f25f0e1526528f7 Mon Sep 17 00:00:00 2001
26ba25
From: Kevin Wolf <kwolf@redhat.com>
26ba25
Date: Tue, 26 Jun 2018 09:48:13 +0200
26ba25
Subject: [PATCH 105/268] job: Move BlockJobCreateFlags to Job
26ba25
26ba25
RH-Author: Kevin Wolf <kwolf@redhat.com>
26ba25
Message-id: <20180626094856.6924-31-kwolf@redhat.com>
26ba25
Patchwork-id: 81106
26ba25
O-Subject: [RHV-7.6 qemu-kvm-rhev PATCH v2 30/73] job: Move BlockJobCreateFlags 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
This renames the BlockJobCreateFlags constants, moves a few JOB_INTERNAL
26ba25
checks to job_create() and the auto_{finalize,dismiss} fields from
26ba25
BlockJob 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 bb02b65c7d57e4f2136f39bfba95cc68d89eb216)
26ba25
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
26ba25
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
26ba25
---
26ba25
 block/commit.c               |  2 +-
26ba25
 block/mirror.c               |  2 +-
26ba25
 block/replication.c          |  4 ++--
26ba25
 block/stream.c               |  2 +-
26ba25
 blockdev.c                   | 14 +++++++-------
26ba25
 blockjob.c                   | 27 +++++++--------------------
26ba25
 include/block/blockjob.h     | 17 -----------------
26ba25
 include/block/blockjob_int.h |  3 +--
26ba25
 include/qemu/job.h           | 20 +++++++++++++++++++-
26ba25
 job.c                        | 11 ++++++++++-
26ba25
 qemu-img.c                   |  2 +-
26ba25
 tests/test-blockjob-txn.c    |  2 +-
26ba25
 tests/test-blockjob.c        |  4 ++--
26ba25
 13 files changed, 53 insertions(+), 57 deletions(-)
26ba25
26ba25
diff --git a/block/commit.c b/block/commit.c
26ba25
index c4a98e5..7a6ae59 100644
26ba25
--- a/block/commit.c
26ba25
+++ b/block/commit.c
26ba25
@@ -282,7 +282,7 @@ void commit_start(const char *job_id, BlockDriverState *bs,
26ba25
     }
26ba25
 
26ba25
     s = block_job_create(job_id, &commit_job_driver, NULL, bs, 0, BLK_PERM_ALL,
26ba25
-                         speed, BLOCK_JOB_DEFAULT, NULL, NULL, errp);
26ba25
+                         speed, JOB_DEFAULT, NULL, NULL, errp);
26ba25
     if (!s) {
26ba25
         return;
26ba25
     }
26ba25
diff --git a/block/mirror.c b/block/mirror.c
26ba25
index 9a7226f..5091e72 100644
26ba25
--- a/block/mirror.c
26ba25
+++ b/block/mirror.c
26ba25
@@ -1284,7 +1284,7 @@ void mirror_start(const char *job_id, BlockDriverState *bs,
26ba25
     }
26ba25
     is_none_mode = mode == MIRROR_SYNC_MODE_NONE;
26ba25
     base = mode == MIRROR_SYNC_MODE_TOP ? backing_bs(bs) : NULL;
26ba25
-    mirror_start_job(job_id, bs, BLOCK_JOB_DEFAULT, target, replaces,
26ba25
+    mirror_start_job(job_id, bs, JOB_DEFAULT, target, replaces,
26ba25
                      speed, granularity, buf_size, backing_mode,
26ba25
                      on_source_error, on_target_error, unmap, NULL, NULL,
26ba25
                      &mirror_job_driver, is_none_mode, base, false,
26ba25
diff --git a/block/replication.c b/block/replication.c
26ba25
index 3f7500e..8241400 100644
26ba25
--- a/block/replication.c
26ba25
+++ b/block/replication.c
26ba25
@@ -566,7 +566,7 @@ static void replication_start(ReplicationState *rs, ReplicationMode mode,
26ba25
         job = backup_job_create(NULL, s->secondary_disk->bs, s->hidden_disk->bs,
26ba25
                                 0, MIRROR_SYNC_MODE_NONE, NULL, false,
26ba25
                                 BLOCKDEV_ON_ERROR_REPORT,
26ba25
-                                BLOCKDEV_ON_ERROR_REPORT, BLOCK_JOB_INTERNAL,
26ba25
+                                BLOCKDEV_ON_ERROR_REPORT, JOB_INTERNAL,
26ba25
                                 backup_job_completed, bs, NULL, &local_err);
26ba25
         if (local_err) {
26ba25
             error_propagate(errp, local_err);
26ba25
@@ -691,7 +691,7 @@ static void replication_stop(ReplicationState *rs, bool failover, Error **errp)
26ba25
 
26ba25
         s->stage = BLOCK_REPLICATION_FAILOVER;
26ba25
         commit_active_start(NULL, s->active_disk->bs, s->secondary_disk->bs,
26ba25
-                            BLOCK_JOB_INTERNAL, 0, BLOCKDEV_ON_ERROR_REPORT,
26ba25
+                            JOB_INTERNAL, 0, BLOCKDEV_ON_ERROR_REPORT,
26ba25
                             NULL, replication_done, bs, true, errp);
26ba25
         break;
26ba25
     default:
26ba25
diff --git a/block/stream.c b/block/stream.c
26ba25
index e81b488..eee0253 100644
26ba25
--- a/block/stream.c
26ba25
+++ b/block/stream.c
26ba25
@@ -242,7 +242,7 @@ void stream_start(const char *job_id, BlockDriverState *bs,
26ba25
                          BLK_PERM_GRAPH_MOD,
26ba25
                          BLK_PERM_CONSISTENT_READ | BLK_PERM_WRITE_UNCHANGED |
26ba25
                          BLK_PERM_WRITE,
26ba25
-                         speed, BLOCK_JOB_DEFAULT, NULL, NULL, errp);
26ba25
+                         speed, JOB_DEFAULT, NULL, NULL, errp);
26ba25
     if (!s) {
26ba25
         goto fail;
26ba25
     }
26ba25
diff --git a/blockdev.c b/blockdev.c
26ba25
index 522158c..24deaf1 100644
26ba25
--- a/blockdev.c
26ba25
+++ b/blockdev.c
26ba25
@@ -3245,7 +3245,7 @@ void qmp_block_commit(bool has_job_id, const char *job_id, const char *device,
26ba25
             goto out;
26ba25
         }
26ba25
         commit_active_start(has_job_id ? job_id : NULL, bs, base_bs,
26ba25
-                            BLOCK_JOB_DEFAULT, speed, on_error,
26ba25
+                            JOB_DEFAULT, speed, on_error,
26ba25
                             filter_node_name, NULL, NULL, false, &local_err);
26ba25
     } else {
26ba25
         BlockDriverState *overlay_bs = bdrv_find_overlay(bs, top_bs);
26ba25
@@ -3276,7 +3276,7 @@ static BlockJob *do_drive_backup(DriveBackup *backup, BlockJobTxn *txn,
26ba25
     AioContext *aio_context;
26ba25
     QDict *options = NULL;
26ba25
     Error *local_err = NULL;
26ba25
-    int flags, job_flags = BLOCK_JOB_DEFAULT;
26ba25
+    int flags, job_flags = JOB_DEFAULT;
26ba25
     int64_t size;
26ba25
     bool set_backing_hd = false;
26ba25
 
26ba25
@@ -3399,10 +3399,10 @@ static BlockJob *do_drive_backup(DriveBackup *backup, BlockJobTxn *txn,
26ba25
         }
26ba25
     }
26ba25
     if (!backup->auto_finalize) {
26ba25
-        job_flags |= BLOCK_JOB_MANUAL_FINALIZE;
26ba25
+        job_flags |= JOB_MANUAL_FINALIZE;
26ba25
     }
26ba25
     if (!backup->auto_dismiss) {
26ba25
-        job_flags |= BLOCK_JOB_MANUAL_DISMISS;
26ba25
+        job_flags |= JOB_MANUAL_DISMISS;
26ba25
     }
26ba25
 
26ba25
     job = backup_job_create(backup->job_id, bs, target_bs, backup->speed,
26ba25
@@ -3443,7 +3443,7 @@ BlockJob *do_blockdev_backup(BlockdevBackup *backup, BlockJobTxn *txn,
26ba25
     Error *local_err = NULL;
26ba25
     AioContext *aio_context;
26ba25
     BlockJob *job = NULL;
26ba25
-    int job_flags = BLOCK_JOB_DEFAULT;
26ba25
+    int job_flags = JOB_DEFAULT;
26ba25
 
26ba25
     if (!backup->has_speed) {
26ba25
         backup->speed = 0;
26ba25
@@ -3492,10 +3492,10 @@ BlockJob *do_blockdev_backup(BlockdevBackup *backup, BlockJobTxn *txn,
26ba25
         }
26ba25
     }
26ba25
     if (!backup->auto_finalize) {
26ba25
-        job_flags |= BLOCK_JOB_MANUAL_FINALIZE;
26ba25
+        job_flags |= JOB_MANUAL_FINALIZE;
26ba25
     }
26ba25
     if (!backup->auto_dismiss) {
26ba25
-        job_flags |= BLOCK_JOB_MANUAL_DISMISS;
26ba25
+        job_flags |= JOB_MANUAL_DISMISS;
26ba25
     }
26ba25
     job = backup_job_create(backup->job_id, bs, target_bs, backup->speed,
26ba25
                             backup->sync, NULL, backup->compress,
26ba25
diff --git a/blockjob.c b/blockjob.c
26ba25
index a1d1f48..d9d8ff7 100644
26ba25
--- a/blockjob.c
26ba25
+++ b/blockjob.c
26ba25
@@ -285,7 +285,7 @@ static void block_job_do_dismiss(BlockJob *job)
26ba25
 static void block_job_conclude(BlockJob *job)
26ba25
 {
26ba25
     job_state_transition(&job->job, JOB_STATUS_CONCLUDED);
26ba25
-    if (job->auto_dismiss || !job_started(&job->job)) {
26ba25
+    if (job->job.auto_dismiss || !job_started(&job->job)) {
26ba25
         block_job_do_dismiss(job);
26ba25
     }
26ba25
 }
26ba25
@@ -483,7 +483,7 @@ static void block_job_completed_txn_abort(BlockJob *job)
26ba25
 
26ba25
 static int block_job_needs_finalize(BlockJob *job)
26ba25
 {
26ba25
-    return !job->auto_finalize;
26ba25
+    return !job->job.auto_finalize;
26ba25
 }
26ba25
 
26ba25
 static void block_job_do_finalize(BlockJob *job)
26ba25
@@ -688,8 +688,8 @@ BlockJobInfo *block_job_query(BlockJob *job, Error **errp)
26ba25
     info->io_status = job->iostatus;
26ba25
     info->ready     = job->ready;
26ba25
     info->status    = job->job.status;
26ba25
-    info->auto_finalize = job->auto_finalize;
26ba25
-    info->auto_dismiss  = job->auto_dismiss;
26ba25
+    info->auto_finalize = job->job.auto_finalize;
26ba25
+    info->auto_dismiss  = job->job.auto_dismiss;
26ba25
     info->has_error = job->ret != 0;
26ba25
     info->error     = job->ret ? g_strdup(strerror(-job->ret)) : NULL;
26ba25
     return info;
26ba25
@@ -736,7 +736,7 @@ static void block_job_event_completed(BlockJob *job, const char *msg)
26ba25
 static int block_job_event_pending(BlockJob *job)
26ba25
 {
26ba25
     job_state_transition(&job->job, JOB_STATUS_PENDING);
26ba25
-    if (!job->auto_finalize && !block_job_is_internal(job)) {
26ba25
+    if (!job->job.auto_finalize && !block_job_is_internal(job)) {
26ba25
         qapi_event_send_block_job_pending(job_type(&job->job),
26ba25
                                           job->job.id,
26ba25
                                           &error_abort);
26ba25
@@ -763,19 +763,8 @@ void *block_job_create(const char *job_id, const BlockJobDriver *driver,
26ba25
         return NULL;
26ba25
     }
26ba25
 
26ba25
-    if (job_id == NULL && !(flags & BLOCK_JOB_INTERNAL)) {
26ba25
+    if (job_id == NULL && !(flags & JOB_INTERNAL)) {
26ba25
         job_id = bdrv_get_device_name(bs);
26ba25
-        if (!*job_id) {
26ba25
-            error_setg(errp, "An explicit job ID is required for this node");
26ba25
-            return NULL;
26ba25
-        }
26ba25
-    }
26ba25
-
26ba25
-    if (job_id) {
26ba25
-        if (flags & BLOCK_JOB_INTERNAL) {
26ba25
-            error_setg(errp, "Cannot specify job ID for internal block job");
26ba25
-            return NULL;
26ba25
-        }
26ba25
     }
26ba25
 
26ba25
     blk = blk_new(perm, shared_perm);
26ba25
@@ -786,7 +775,7 @@ void *block_job_create(const char *job_id, const BlockJobDriver *driver,
26ba25
     }
26ba25
 
26ba25
     job = job_create(job_id, &driver->job_driver, blk_get_aio_context(blk),
26ba25
-                     errp);
26ba25
+                     flags, errp);
26ba25
     if (job == NULL) {
26ba25
         blk_unref(blk);
26ba25
         return NULL;
26ba25
@@ -800,8 +789,6 @@ void *block_job_create(const char *job_id, const BlockJobDriver *driver,
26ba25
     job->blk           = blk;
26ba25
     job->cb            = cb;
26ba25
     job->opaque        = opaque;
26ba25
-    job->auto_finalize = !(flags & BLOCK_JOB_MANUAL_FINALIZE);
26ba25
-    job->auto_dismiss  = !(flags & BLOCK_JOB_MANUAL_DISMISS);
26ba25
 
26ba25
     error_setg(&job->blocker, "block device is in use by block job: %s",
26ba25
                job_type_str(&job->job));
26ba25
diff --git a/include/block/blockjob.h b/include/block/blockjob.h
26ba25
index 3e94e18..f9aaaaa 100644
26ba25
--- a/include/block/blockjob.h
26ba25
+++ b/include/block/blockjob.h
26ba25
@@ -91,27 +91,10 @@ typedef struct BlockJob {
26ba25
     /** ret code passed to block_job_completed. */
26ba25
     int ret;
26ba25
 
26ba25
-    /** True if this job should automatically finalize itself */
26ba25
-    bool auto_finalize;
26ba25
-
26ba25
-    /** True if this job should automatically dismiss itself */
26ba25
-    bool auto_dismiss;
26ba25
-
26ba25
     BlockJobTxn *txn;
26ba25
     QLIST_ENTRY(BlockJob) txn_list;
26ba25
 } BlockJob;
26ba25
 
26ba25
-typedef enum BlockJobCreateFlags {
26ba25
-    /* Default behavior */
26ba25
-    BLOCK_JOB_DEFAULT = 0x00,
26ba25
-    /* BlockJob is not QMP-created and should not send QMP events */
26ba25
-    BLOCK_JOB_INTERNAL = 0x01,
26ba25
-    /* BlockJob requires manual finalize step */
26ba25
-    BLOCK_JOB_MANUAL_FINALIZE = 0x02,
26ba25
-    /* BlockJob requires manual dismiss step */
26ba25
-    BLOCK_JOB_MANUAL_DISMISS = 0x04,
26ba25
-} BlockJobCreateFlags;
26ba25
-
26ba25
 /**
26ba25
  * block_job_next:
26ba25
  * @job: A block job, or %NULL.
26ba25
diff --git a/include/block/blockjob_int.h b/include/block/blockjob_int.h
26ba25
index 7e705ae..88639f7 100644
26ba25
--- a/include/block/blockjob_int.h
26ba25
+++ b/include/block/blockjob_int.h
26ba25
@@ -106,8 +106,7 @@ struct BlockJobDriver {
26ba25
  * @bs: The block
26ba25
  * @perm, @shared_perm: Permissions to request for @bs
26ba25
  * @speed: The maximum speed, in bytes per second, or 0 for unlimited.
26ba25
- * @flags: Creation flags for the Block Job.
26ba25
- *         See @BlockJobCreateFlags
26ba25
+ * @flags: Creation flags for the Block Job. See @JobCreateFlags.
26ba25
  * @cb: Completion function for the job.
26ba25
  * @opaque: Opaque pointer value passed to @cb.
26ba25
  * @errp: Error object.
26ba25
diff --git a/include/qemu/job.h b/include/qemu/job.h
26ba25
index 858f3be..9783e40 100644
26ba25
--- a/include/qemu/job.h
26ba25
+++ b/include/qemu/job.h
26ba25
@@ -99,6 +99,12 @@ typedef struct Job {
26ba25
     /** Set to true when the job has deferred work to the main loop. */
26ba25
     bool deferred_to_main_loop;
26ba25
 
26ba25
+    /** True if this job should automatically finalize itself */
26ba25
+    bool auto_finalize;
26ba25
+
26ba25
+    /** True if this job should automatically dismiss itself */
26ba25
+    bool auto_dismiss;
26ba25
+
26ba25
     /** Element of the list of jobs */
26ba25
     QLIST_ENTRY(Job) job_list;
26ba25
 } Job;
26ba25
@@ -140,6 +146,17 @@ struct JobDriver {
26ba25
     void (*free)(Job *job);
26ba25
 };
26ba25
 
26ba25
+typedef enum JobCreateFlags {
26ba25
+    /* Default behavior */
26ba25
+    JOB_DEFAULT = 0x00,
26ba25
+    /* Job is not QMP-created and should not send QMP events */
26ba25
+    JOB_INTERNAL = 0x01,
26ba25
+    /* Job requires manual finalize step */
26ba25
+    JOB_MANUAL_FINALIZE = 0x02,
26ba25
+    /* Job requires manual dismiss step */
26ba25
+    JOB_MANUAL_DISMISS = 0x04,
26ba25
+} JobCreateFlags;
26ba25
+
26ba25
 
26ba25
 /**
26ba25
  * Create a new long-running job and return it.
26ba25
@@ -147,10 +164,11 @@ struct JobDriver {
26ba25
  * @job_id: The id of the newly-created job, or %NULL for internal jobs
26ba25
  * @driver: The class object for the newly-created job.
26ba25
  * @ctx: The AioContext to run the job coroutine in.
26ba25
+ * @flags: Creation flags for the job. See @JobCreateFlags.
26ba25
  * @errp: Error object.
26ba25
  */
26ba25
 void *job_create(const char *job_id, const JobDriver *driver, AioContext *ctx,
26ba25
-                 Error **errp);
26ba25
+                 int flags, Error **errp);
26ba25
 
26ba25
 /**
26ba25
  * Add a reference to Job refcnt, it will be decreased with job_unref, and then
26ba25
diff --git a/job.c b/job.c
26ba25
index aaacfcc..dd46170 100644
26ba25
--- a/job.c
26ba25
+++ b/job.c
26ba25
@@ -182,11 +182,15 @@ static void job_sleep_timer_cb(void *opaque)
26ba25
 }
26ba25
 
26ba25
 void *job_create(const char *job_id, const JobDriver *driver, AioContext *ctx,
26ba25
-                 Error **errp)
26ba25
+                 int flags, Error **errp)
26ba25
 {
26ba25
     Job *job;
26ba25
 
26ba25
     if (job_id) {
26ba25
+        if (flags & JOB_INTERNAL) {
26ba25
+            error_setg(errp, "Cannot specify job ID for internal job");
26ba25
+            return NULL;
26ba25
+        }
26ba25
         if (!id_wellformed(job_id)) {
26ba25
             error_setg(errp, "Invalid job ID '%s'", job_id);
26ba25
             return NULL;
26ba25
@@ -195,6 +199,9 @@ void *job_create(const char *job_id, const JobDriver *driver, AioContext *ctx,
26ba25
             error_setg(errp, "Job ID '%s' already in use", job_id);
26ba25
             return NULL;
26ba25
         }
26ba25
+    } else if (!(flags & JOB_INTERNAL)) {
26ba25
+        error_setg(errp, "An explicit job ID is required");
26ba25
+        return NULL;
26ba25
     }
26ba25
 
26ba25
     job = g_malloc0(driver->instance_size);
26ba25
@@ -205,6 +212,8 @@ void *job_create(const char *job_id, const JobDriver *driver, AioContext *ctx,
26ba25
     job->busy          = false;
26ba25
     job->paused        = true;
26ba25
     job->pause_count   = 1;
26ba25
+    job->auto_finalize = !(flags & JOB_MANUAL_FINALIZE);
26ba25
+    job->auto_dismiss  = !(flags & JOB_MANUAL_DISMISS);
26ba25
 
26ba25
     job_state_transition(job, JOB_STATUS_CREATED);
26ba25
     aio_timer_init(qemu_get_aio_context(), &job->sleep_timer,
26ba25
diff --git a/qemu-img.c b/qemu-img.c
26ba25
index f5bb0ef..843dc6a 100644
26ba25
--- a/qemu-img.c
26ba25
+++ b/qemu-img.c
26ba25
@@ -1026,7 +1026,7 @@ static int img_commit(int argc, char **argv)
26ba25
 
26ba25
     aio_context = bdrv_get_aio_context(bs);
26ba25
     aio_context_acquire(aio_context);
26ba25
-    commit_active_start("commit", bs, base_bs, BLOCK_JOB_DEFAULT, 0,
26ba25
+    commit_active_start("commit", bs, base_bs, JOB_DEFAULT, 0,
26ba25
                         BLOCKDEV_ON_ERROR_REPORT, NULL, common_block_job_cb,
26ba25
                         &cbi, false, &local_err);
26ba25
     aio_context_release(aio_context);
26ba25
diff --git a/tests/test-blockjob-txn.c b/tests/test-blockjob-txn.c
26ba25
index 93d1ff0..60e9fa2 100644
26ba25
--- a/tests/test-blockjob-txn.c
26ba25
+++ b/tests/test-blockjob-txn.c
26ba25
@@ -107,7 +107,7 @@ static BlockJob *test_block_job_start(unsigned int iterations,
26ba25
 
26ba25
     snprintf(job_id, sizeof(job_id), "job%u", counter++);
26ba25
     s = block_job_create(job_id, &test_block_job_driver, txn, bs,
26ba25
-                         0, BLK_PERM_ALL, 0, BLOCK_JOB_DEFAULT,
26ba25
+                         0, BLK_PERM_ALL, 0, JOB_DEFAULT,
26ba25
                          test_block_job_cb, data, &error_abort);
26ba25
     s->iterations = iterations;
26ba25
     s->use_timer = use_timer;
26ba25
diff --git a/tests/test-blockjob.c b/tests/test-blockjob.c
26ba25
index ceb5960..8bb0aa8 100644
26ba25
--- a/tests/test-blockjob.c
26ba25
+++ b/tests/test-blockjob.c
26ba25
@@ -59,7 +59,7 @@ static BlockJob *do_test_id(BlockBackend *blk, const char *id,
26ba25
                             bool should_succeed)
26ba25
 {
26ba25
     return mk_job(blk, id, &test_block_job_driver,
26ba25
-                  should_succeed, BLOCK_JOB_DEFAULT);
26ba25
+                  should_succeed, JOB_DEFAULT);
26ba25
 }
26ba25
 
26ba25
 /* This creates a BlockBackend (optionally with a name) with a
26ba25
@@ -214,7 +214,7 @@ static CancelJob *create_common(BlockJob **pjob)
26ba25
 
26ba25
     blk = create_blk(NULL);
26ba25
     job = mk_job(blk, "Steve", &test_cancel_driver, true,
26ba25
-                 BLOCK_JOB_MANUAL_FINALIZE | BLOCK_JOB_MANUAL_DISMISS);
26ba25
+                 JOB_MANUAL_FINALIZE | JOB_MANUAL_DISMISS);
26ba25
     job_ref(&job->job);
26ba25
     assert(job->job.status == JOB_STATUS_CREATED);
26ba25
     s = container_of(job, CancelJob, common);
26ba25
-- 
26ba25
1.8.3.1
26ba25