| Message ID | 1623898035-18533-2-git-send-email-lei.rao@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Fixed some bugs and optimized some codes for COLO | expand |
* Lei Rao (lei.rao@intel.com) wrote: > From: "Rao, Lei" <lei.rao@intel.com> > > Signed-off-by: Lei Rao <lei.rao@intel.com> > --- Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> OK, although to be honest, I think the compiler will probably do this for you. > migration/colo.c | 2 +- > net/colo-compare.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/migration/colo.c b/migration/colo.c > index 79fa1f6..616dc00 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 b100e7b..4a64a5d 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) > -- > 1.8.3.1 >
diff --git a/migration/colo.c b/migration/colo.c index 79fa1f6..616dc00 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 b100e7b..4a64a5d 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)