qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Rao, Lei" <lei.rao@intel.com>
To: chen.zhang@intel.com, lizhijian@cn.fujitsu.com,
	jasowang@redhat.com, zhang.zhanghailiang@huawei.com,
	quintela@redhat.com, lukasstraub2@web.de, dgilbert@redhat.com
Cc: "Rao, Lei" <lei.rao@intel.com>, qemu-devel@nongnu.org
Subject: [PATCH v2 6/7] Changed the last-mode to none of first start COLO
Date: Mon,  1 Nov 2021 15:57:04 +0800	[thread overview]
Message-ID: <1635753425-11756-7-git-send-email-lei.rao@intel.com> (raw)
In-Reply-To: <1635753425-11756-1-git-send-email-lei.rao@intel.com>

From: "Rao, Lei" <lei.rao@intel.com>

When we first stated the COLO, the last-mode is as follows:
{ "execute": "query-colo-status" }
{"return": {"last-mode": "primary", "mode": "primary", "reason": "none"}}

The last-mode is unreasonable. After the patch, will be changed to the
following:
{ "execute": "query-colo-status" }
{"return": {"last-mode": "none", "mode": "primary", "reason": "none"}}

Signed-off-by: Lei Rao <lei.rao@intel.com>
---
 migration/colo.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/migration/colo.c b/migration/colo.c
index 71fc82a040..e3b1f136f4 100644
--- a/migration/colo.c
+++ b/migration/colo.c
@@ -205,7 +205,7 @@ void colo_do_failover(void)
         vm_stop_force_state(RUN_STATE_COLO);
     }
 
-    switch (get_colo_mode()) {
+    switch (last_colo_mode = get_colo_mode()) {
     case COLO_MODE_PRIMARY:
         primary_vm_do_failover();
         break;
@@ -530,8 +530,7 @@ static void colo_process_checkpoint(MigrationState *s)
     Error *local_err = NULL;
     int ret;
 
-    last_colo_mode = get_colo_mode();
-    if (last_colo_mode != COLO_MODE_PRIMARY) {
+    if (get_colo_mode() != COLO_MODE_PRIMARY) {
         error_report("COLO mode must be COLO_MODE_PRIMARY");
         return;
     }
@@ -830,8 +829,7 @@ void *colo_process_incoming_thread(void *opaque)
     migrate_set_state(&mis->state, MIGRATION_STATUS_ACTIVE,
                       MIGRATION_STATUS_COLO);
 
-    last_colo_mode = get_colo_mode();
-    if (last_colo_mode != COLO_MODE_SECONDARY) {
+    if (get_colo_mode() != COLO_MODE_SECONDARY) {
         error_report("COLO mode must be COLO_MODE_SECONDARY");
         return NULL;
     }
-- 
2.30.2



  parent reply	other threads:[~2021-11-01  8:09 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-01  7:56 [PATCH v2 0/7] Fixed some bugs and optimized some codes for COLO Rao, Lei
2021-11-01  7:56 ` [PATCH v2 1/7] Some minor optimizations " Rao, Lei
2021-11-02 15:56   ` Juan Quintela
2021-11-01  7:57 ` [PATCH v2 2/7] Fixed qemu crash when guest power off in COLO mode Rao, Lei
2021-11-02 15:58   ` Juan Quintela
2021-11-01  7:57 ` [PATCH v2 3/7] Fixed SVM hang when do failover before PVM crash Rao, Lei
2021-11-02 16:00   ` Juan Quintela
2021-11-01  7:57 ` [PATCH v2 4/7] colo: fixed 'Segmentation fault' when the simplex mode PVM poweroff Rao, Lei
2021-11-02 16:03   ` Juan Quintela
2021-11-01  7:57 ` [PATCH v2 5/7] Removed the qemu_fclose() in colo_process_incoming_thread Rao, Lei
2021-11-02 16:07   ` Juan Quintela
2021-11-01  7:57 ` Rao, Lei [this message]
2021-11-02 16:10   ` [PATCH v2 6/7] Changed the last-mode to none of first start COLO Juan Quintela
2021-11-01  7:57 ` [PATCH v2 7/7] Optimized the function of fill_connection_key Rao, Lei
2021-11-02 16:22   ` Juan Quintela
2021-11-03  1:49     ` Rao, Lei

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1635753425-11756-7-git-send-email-lei.rao@intel.com \
    --to=lei.rao@intel.com \
    --cc=chen.zhang@intel.com \
    --cc=dgilbert@redhat.com \
    --cc=jasowang@redhat.com \
    --cc=lizhijian@cn.fujitsu.com \
    --cc=lukasstraub2@web.de \
    --cc=qemu-devel@nongnu.org \
    --cc=quintela@redhat.com \
    --cc=zhang.zhanghailiang@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).