From patchwork Sun Jun 2 03:42:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Chen" X-Patchwork-Id: 1108896 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=intel.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45GkjQ3wynz9sBr for ; Sun, 2 Jun 2019 13:50:18 +1000 (AEST) Received: from localhost ([127.0.0.1]:44465 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hXHVg-0000YZ-J8 for incoming@patchwork.ozlabs.org; Sat, 01 Jun 2019 23:50:16 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47085) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hXHSr-0007EC-1I for qemu-devel@nongnu.org; Sat, 01 Jun 2019 23:47:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hXHSq-0003Cu-0F for qemu-devel@nongnu.org; Sat, 01 Jun 2019 23:47:20 -0400 Received: from mga12.intel.com ([192.55.52.136]:51833) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hXHSp-00030z-Ns for qemu-devel@nongnu.org; Sat, 01 Jun 2019 23:47:19 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Jun 2019 20:47:19 -0700 X-ExtLoop1: 1 Received: from unknown (HELO localhost.localdomain) ([10.239.13.19]) by orsmga005.jf.intel.com with ESMTP; 01 Jun 2019 20:47:17 -0700 From: Zhang Chen To: Li Zhijian , "Dr. David Alan Gilbert" , Juan Quintela , zhanghailiang , Jason Wang , qemu-dev Date: Sun, 2 Jun 2019 11:42:38 +0800 Message-Id: <20190602034239.23225-6-chen.zhang@intel.com> X-Mailer: git-send-email 2.17.GIT In-Reply-To: <20190602034239.23225-1-chen.zhang@intel.com> References: <20190602034239.23225-1-chen.zhang@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.136 Subject: [Qemu-devel] [PATCH 5/6] COLO-compare: Rename the colo_compare_inconsistency_notify X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Zhang Chen , Zhang Chen Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Zhang Chen We have add the notify_remote_frame function for Xen, so we rename the colo_compare_inconsistency_notify to notify_native_frame(KVM-qemu COLO frame) looks better. Signed-off-by: Zhang Chen --- net/colo-compare.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/colo-compare.c b/net/colo-compare.c index 19075c7a66..101c1f477e 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -120,7 +120,7 @@ enum { SECONDARY_IN, }; -static void colo_compare_inconsistency_notify(void) +static void notify_native_frame(void) { notifier_list_notify(&colo_compare_notifiers, migrate_get_current()); @@ -449,7 +449,7 @@ sec: if (s->notify_dev) { notify_remote_frame(s); } else { - colo_compare_inconsistency_notify(); + notify_native_frame(); } } } @@ -606,7 +606,7 @@ static int colo_old_packet_check_one_conn(Connection *conn, if (s->notify_dev) { notify_remote_frame(s); } else { - colo_compare_inconsistency_notify(); + notify_native_frame(); } return 0; } @@ -660,7 +660,7 @@ static void colo_compare_packet(CompareState *s, Connection *conn, if (s->notify_dev) { notify_remote_frame(s); } else { - colo_compare_inconsistency_notify(); + notify_native_frame(); } break; }