From 626d23419335db221e7b52a5bc07ad4f74391199 Mon Sep 17 00:00:00 2001

Message-Id: <626d23419335db221e7b52a5bc07ad4f74391199@dist-git>

From: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>

Date: Fri, 1 Sep 2017 09:49:21 +0300

Subject: [PATCH] qemu: introduce QEMU_DOMAIN_JOB_STATUS_POSTCOPY

Let's introduce QEMU_DOMAIN_JOB_STATUS_POSTCOPY state for job.current->status

instead of checking job.current->stats.status. The latter can be changed

when fetching migration statistics. Moving state function from the variable

and leave only store function seems more managable.

This patch removes all state checking usage of stats except for

qemuDomainGetJobStatsInternal. This place will be handled separately.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>

(cherry picked from commit 09f57f9aaca6d2703567d5cda45d47fc06131ae0)

https://bugzilla.redhat.com/show_bug.cgi?id=1530130

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>

---

 src/qemu/qemu_domain.c    |  1 +

 src/qemu/qemu_domain.h    |  1 +

 src/qemu/qemu_driver.c    |  5 +++--

 src/qemu/qemu_migration.c | 18 +++++++++++-------

 src/qemu/qemu_process.c   |  4 ++--

 5 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c

index c9b3e13892..329ec6e2ce 100644

--- a/src/qemu/qemu_domain.c

+++ b/src/qemu/qemu_domain.c

@@ -397,6 +397,7 @@ qemuDomainJobStatusToType(qemuDomainJobStatus status)

         break;

     case QEMU_DOMAIN_JOB_STATUS_ACTIVE:

+    case QEMU_DOMAIN_JOB_STATUS_POSTCOPY:

         return VIR_DOMAIN_JOB_UNBOUNDED;

     case QEMU_DOMAIN_JOB_STATUS_COMPLETED:

diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h

index e4e672f872..c8b3873b9f 100644

--- a/src/qemu/qemu_domain.h

+++ b/src/qemu/qemu_domain.h

@@ -102,6 +102,7 @@ VIR_ENUM_DECL(qemuDomainAsyncJob)

 typedef enum {

     QEMU_DOMAIN_JOB_STATUS_NONE = 0,

     QEMU_DOMAIN_JOB_STATUS_ACTIVE,

+    QEMU_DOMAIN_JOB_STATUS_POSTCOPY,

     QEMU_DOMAIN_JOB_STATUS_COMPLETED,

     QEMU_DOMAIN_JOB_STATUS_FAILED,

     QEMU_DOMAIN_JOB_STATUS_CANCELED,

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c

index a271f60abf..ecba87a121 100644

--- a/src/qemu/qemu_driver.c

+++ b/src/qemu/qemu_driver.c

@@ -12971,7 +12971,8 @@ qemuDomainGetJobStatsInternal(virQEMUDriverPtr driver,

     }

     *jobInfo = *info;

-    if (jobInfo->status == QEMU_DOMAIN_JOB_STATUS_ACTIVE) {

+    if (jobInfo->status == QEMU_DOMAIN_JOB_STATUS_ACTIVE ||

+        jobInfo->status == QEMU_DOMAIN_JOB_STATUS_POSTCOPY) {

         if (fetch)

             ret = qemuMigrationFetchJobStatus(driver, vm, QEMU_ASYNC_JOB_NONE,

                                               jobInfo);

@@ -13105,7 +13106,7 @@ static int qemuDomainAbortJob(virDomainPtr dom)

     }

     if (priv->job.asyncJob == QEMU_ASYNC_JOB_MIGRATION_OUT &&

-        (priv->job.current->stats.status == QEMU_MONITOR_MIGRATION_STATUS_POSTCOPY ||

+        (priv->job.current->status == QEMU_DOMAIN_JOB_STATUS_POSTCOPY ||

          (virDomainObjGetState(vm, &reason) == VIR_DOMAIN_PAUSED &&

           reason == VIR_DOMAIN_PAUSED_POSTCOPY))) {

         virReportError(VIR_ERR_OPERATION_INVALID, "%s",

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c

index 500f467f25..1726349f94 100644

--- a/src/qemu/qemu_migration.c

+++ b/src/qemu/qemu_migration.c

@@ -1333,6 +1333,10 @@ static void

 qemuMigrationUpdateJobType(qemuDomainJobInfoPtr jobInfo)

 {

     switch ((qemuMonitorMigrationStatus) jobInfo->stats.status) {

+    case QEMU_MONITOR_MIGRATION_STATUS_POSTCOPY:

+        jobInfo->status = QEMU_DOMAIN_JOB_STATUS_POSTCOPY;

+        break;

+

     case QEMU_MONITOR_MIGRATION_STATUS_COMPLETED:

         jobInfo->status = QEMU_DOMAIN_JOB_STATUS_COMPLETED;

         break;

@@ -1351,7 +1355,6 @@ qemuMigrationUpdateJobType(qemuDomainJobInfoPtr jobInfo)

     case QEMU_MONITOR_MIGRATION_STATUS_SETUP:

     case QEMU_MONITOR_MIGRATION_STATUS_ACTIVE:

-    case QEMU_MONITOR_MIGRATION_STATUS_POSTCOPY:

     case QEMU_MONITOR_MIGRATION_STATUS_CANCELLING:

     case QEMU_MONITOR_MIGRATION_STATUS_LAST:

         break;

@@ -1457,6 +1460,7 @@ qemuMigrationCheckJobStatus(virQEMUDriverPtr driver,

         break;

     case QEMU_DOMAIN_JOB_STATUS_ACTIVE:

+    case QEMU_DOMAIN_JOB_STATUS_POSTCOPY:

         break;

     }

     return 0;

@@ -1514,8 +1518,7 @@ qemuMigrationCompleted(virQEMUDriverPtr driver,

      * will continue waiting until the migrate state changes to completed.

      */

     if (flags & QEMU_MIGRATION_COMPLETED_POSTCOPY &&

-        jobInfo->status == QEMU_DOMAIN_JOB_STATUS_ACTIVE &&

-        jobInfo->stats.status == QEMU_MONITOR_MIGRATION_STATUS_POSTCOPY) {

+        jobInfo->status == QEMU_DOMAIN_JOB_STATUS_POSTCOPY) {

         VIR_DEBUG("Migration switched to post-copy");

         if (updateStats &&

             qemuMigrationUpdateJobStatus(driver, vm, asyncJob) < 0)

@@ -1529,7 +1532,8 @@ qemuMigrationCompleted(virQEMUDriverPtr driver,

         return 0;

  error:

-    if (jobInfo->status == QEMU_DOMAIN_JOB_STATUS_ACTIVE) {

+    if (jobInfo->status == QEMU_DOMAIN_JOB_STATUS_ACTIVE ||

+        jobInfo->status == QEMU_DOMAIN_JOB_STATUS_POSTCOPY) {

         /* The migration was aborted by us rather than QEMU itself. */

         jobInfo->status = QEMU_DOMAIN_JOB_STATUS_FAILED;

         return -2;

@@ -3824,7 +3828,7 @@ qemuMigrationRun(virQEMUDriverPtr driver,

     else if (rc == -1)

         goto cleanup;

-    if (priv->job.current->stats.status == QEMU_MONITOR_MIGRATION_STATUS_POSTCOPY)

+    if (priv->job.current->status == QEMU_DOMAIN_JOB_STATUS_POSTCOPY)

         inPostCopy = true;

     /* When migration completed, QEMU will have paused the CPUs for us.

@@ -3876,7 +3880,7 @@ qemuMigrationRun(virQEMUDriverPtr driver,

         ignore_value(virTimeMillisNow(&priv->job.completed->sent));

     }

-    if (priv->job.current->status == QEMU_DOMAIN_JOB_STATUS_ACTIVE && !inPostCopy)

+    if (priv->job.current->status == QEMU_DOMAIN_JOB_STATUS_ACTIVE)

         priv->job.current->status = QEMU_DOMAIN_JOB_STATUS_FAILED;

     cookieFlags |= QEMU_MIGRATION_COOKIE_NETWORK |

@@ -5249,7 +5253,7 @@ qemuMigrationFinish(virQEMUDriverPtr driver,

             goto endjob;

     }

-    if (priv->job.current->stats.status == QEMU_MONITOR_MIGRATION_STATUS_POSTCOPY)

+    if (priv->job.current->status == QEMU_DOMAIN_JOB_STATUS_POSTCOPY)

         inPostCopy = true;

     if (!(flags & VIR_MIGRATE_PAUSED)) {

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c

index 3235cebad0..25de367afc 100644

--- a/src/qemu/qemu_process.c

+++ b/src/qemu/qemu_process.c

@@ -723,8 +723,8 @@ qemuProcessHandleStop(qemuMonitorPtr mon ATTRIBUTE_UNUSED,

         }

         if (priv->job.asyncJob == QEMU_ASYNC_JOB_MIGRATION_OUT) {

-            if (priv->job.current->stats.status ==

-                        QEMU_MONITOR_MIGRATION_STATUS_POSTCOPY) {

+            if (priv->job.current->status ==

+                        QEMU_DOMAIN_JOB_STATUS_POSTCOPY) {

                 reason = VIR_DOMAIN_PAUSED_POSTCOPY;

                 detail = VIR_DOMAIN_EVENT_SUSPENDED_POSTCOPY;

             } else {

-- 

2.15.1