From: Rao, Lei <lei.rao@intel.com>
Date: Mon, 1 Nov 2021 07:56:59 +0000 (+0800)
Subject: Some minor optimizations for COLO
X-Git-Tag: v6.2.0-rc0~14^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ae4c2099351a6ea5774428a0884ace32595b341c;p=thirdparty%2Fqemu.git

Some minor optimizations for COLO

Signed-off-by: Lei Rao <lei.rao@intel.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---

diff --git a/migration/colo.c b/migration/colo.c
index 79fa1f66194..616dc00af71 100644
--- a/migration/colo.c
+++ b/migration/colo.c
@@ -152,7 +152,7 @@ static void primary_vm_do_failover(void)
      * kick COLO thread which might wait at
      * qemu_sem_wait(&s->colo_checkpoint_sem).
      */
-    colo_checkpoint_notify(migrate_get_current());
+    colo_checkpoint_notify(s);
 
     /*
      * Wake up COLO thread which may blocked in recv() or send(),
diff --git a/net/colo-compare.c b/net/colo-compare.c
index b100e7b51f5..4a64a5d3869 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -170,7 +170,7 @@ static bool packet_matches_str(const char *str,
         return false;
     }
 
-    return !memcmp(str, buf, strlen(str));
+    return !memcmp(str, buf, packet_len);
 }
 
 static void notify_remote_frame(CompareState *s)