From nobody Fri Nov 7 06:51:28 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1547476795262743.6218381263642; Mon, 14 Jan 2019 06:39:55 -0800 (PST) Received: from localhost ([127.0.0.1]:42017 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj3P8-00046q-65 for importer@patchew.org; Mon, 14 Jan 2019 09:39:54 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50105) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj2uU-0005O9-QQ for qemu-devel@nongnu.org; Mon, 14 Jan 2019 09:08:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gj2uU-0001Jy-0l for qemu-devel@nongnu.org; Mon, 14 Jan 2019 09:08:14 -0500 Received: from mga01.intel.com ([192.55.52.88]:60570) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gj2uT-0001HH-Lv for qemu-devel@nongnu.org; Mon, 14 Jan 2019 09:08:13 -0500 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Jan 2019 06:08:05 -0800 Received: from unknown (HELO localhost.localdomain) ([10.239.13.19]) by orsmga001.jf.intel.com with ESMTP; 14 Jan 2019 06:08:03 -0800 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,477,1539673200"; d="scan'208";a="127576723" From: Zhang Chen To: Li Zhijian , Zhang Chen , Thomas Huth , Jason Wang , qemu-dev Date: Mon, 14 Jan 2019 22:05:10 +0800 Message-Id: <20190114140510.7161-1-chen.zhang@intel.com> X-Mailer: git-send-email 2.17.GIT X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.88 Subject: [Qemu-devel] [PATCH] net/colo-compare.c: Remove duplicated code 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 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: Zhang Chen Fix duplicated code: https://bugs.launchpad.net/qemu/+bug/1811499 Signed-off-by: Zhang Chen Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- net/colo-compare.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/net/colo-compare.c b/net/colo-compare.c index 9156ab3349..fa3fd0632d 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -285,14 +285,6 @@ static bool colo_mark_tcp_pkt(Packet *ppkt, Packet *sp= kt, { *mark =3D 0; =20 - if (ppkt->tcp_seq =3D=3D spkt->tcp_seq && ppkt->seq_end =3D=3D spkt->s= eq_end) { - if (colo_compare_packet_payload(ppkt, spkt, - ppkt->header_size, spkt->header_si= ze, - ppkt->payload_size)) { - *mark =3D COLO_COMPARE_FREE_SECONDARY | COLO_COMPARE_FREE_PRIM= ARY; - return true; - } - } if (ppkt->tcp_seq =3D=3D spkt->tcp_seq && ppkt->seq_end =3D=3D spkt->s= eq_end) { if (colo_compare_packet_payload(ppkt, spkt, ppkt->header_size, spkt->header_si= ze, --=20 2.17.GIT