From nobody Mon Feb 9 03:13:04 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1602827883; cv=none; d=zohomail.com; s=zohoarc; b=HapDUM7xGM3NZKWjoEPnCfQe3FAdgBpvr2wh2p2f3i2cyFCf5YkC6wp5Ndf7jALuntcfK3vIsy+aD8kpNYpLMGnwbRK+QaFrfOJ4+cFl8giG01ux4jjDk9DuW2dEcj74QkO6ZlIq7YkxgP1MkY4EYb8U4VWv/5vI7V4DBzeWx4o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602827883; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=eg9puMZdBhiX54kbjl4y0zwgqwVM158u3CLk3ZmV978=; b=fG/xUKVJks9B9yaV1Aj/pVkNz+zfDOSsQuZpltVtif+wlx2iIkGNuHFAXyiuFzEkwVQf9gzqjnBMCWMoo8SbR5ABqFbiKRhcvUJ01KohagQIiC8gsbkV6TF4PRuVUboIxJ6ktzsdseOnx8XyRKo+Fp7/y77LBT+RzHV0iiZBdjM= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 160282788344351.91871361106132; Thu, 15 Oct 2020 22:58:03 -0700 (PDT) Received: from localhost ([::1]:42136 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kTIkc-0002dh-8E for importer@patchew.org; Fri, 16 Oct 2020 01:58:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44088) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kTIhY-0006Ow-9b for qemu-devel@nongnu.org; Fri, 16 Oct 2020 01:54:52 -0400 Received: from mga01.intel.com ([192.55.52.88]:36632) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kTIhW-0005GT-Ge for qemu-devel@nongnu.org; Fri, 16 Oct 2020 01:54:51 -0400 Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Oct 2020 22:54:48 -0700 Received: from unknown (HELO localhost.localdomain) ([10.239.13.19]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Oct 2020 22:54:46 -0700 IronPort-SDR: D2wDGU1Bb7Lm3TaBHYjQhlUPzdtMgBhVr3JTb3unvjHs7qrFvhEIFrGN0W1mXOYk3Lo8ce6DZG 5kr3lQRY83Gw== X-IronPort-AV: E=McAfee;i="6000,8403,9775"; a="184094660" X-IronPort-AV: E=Sophos;i="5.77,381,1596524400"; d="scan'208";a="184094660" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False IronPort-SDR: oJXi2SHz6/EuetqkrfUnkUy7Hm/9H6gfXxDfDJYeYZvCiyOe2xbXo+MzDqRhvrxVTY638TFZzX JDeU4wixV2ww== X-IronPort-AV: E=Sophos;i="5.77,381,1596524400"; d="scan'208";a="464572840" From: Zhang Chen To: Jason Wang , qemu-dev Subject: [PATCH V2 06/10] colo-compare: check mark in mutual exclusion Date: Fri, 16 Oct 2020 13:52:04 +0800 Message-Id: <20201016055208.7969-7-chen.zhang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201016055208.7969-1-chen.zhang@intel.com> References: <20201016055208.7969-1-chen.zhang@intel.com> Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=192.55.52.88; envelope-from=chen.zhang@intel.com; helo=mga01.intel.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/16 01:54:36 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, FROM_ADDR_WS=2.996, FROM_WSP_TRAIL=1, HEADER_FROM_DIFFERENT_DOMAINS=0.248, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Derek Su , Zhang Chen , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Li Zhijian , Zhang Chen Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Li Zhijian Signed-off-by: Li Zhijian Signed-off-by: Zhang Chen Reviewed-by: Zhang Chen --- net/colo-compare.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/net/colo-compare.c b/net/colo-compare.c index a35c10fb59..8d476bbd99 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -477,13 +477,11 @@ sec: colo_release_primary_pkt(s, ppkt); g_queue_push_head(&conn->secondary_list, spkt); goto pri; - } - if (mark =3D=3D COLO_COMPARE_FREE_SECONDARY) { + } else if (mark =3D=3D COLO_COMPARE_FREE_SECONDARY) { conn->compare_seq =3D spkt->seq_end; packet_destroy(spkt, NULL); goto sec; - } - if (mark =3D=3D (COLO_COMPARE_FREE_PRIMARY | COLO_COMPARE_FREE_SEC= ONDARY)) { + } else if (mark =3D=3D (COLO_COMPARE_FREE_PRIMARY | COLO_COMPARE_F= REE_SECONDARY)) { conn->compare_seq =3D ppkt->seq_end; colo_release_primary_pkt(s, ppkt); packet_destroy(spkt, NULL); --=20 2.17.1