From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 806EEA046B for ; Thu, 27 Jun 2019 05:25:26 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 739073798; Thu, 27 Jun 2019 05:25:26 +0200 (CEST) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id 91034326D for ; Thu, 27 Jun 2019 05:25:24 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Jun 2019 20:25:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,422,1557212400"; d="scan'208";a="313650444" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by orsmga004.jf.intel.com with ESMTP; 26 Jun 2019 20:25:23 -0700 Received: from fmsmsx601.amr.corp.intel.com (10.18.126.81) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 26 Jun 2019 20:25:22 -0700 Received: from fmsmsx601.amr.corp.intel.com (10.18.126.81) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Wed, 26 Jun 2019 20:25:22 -0700 Received: from shsmsx105.ccr.corp.intel.com (10.239.4.158) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Wed, 26 Jun 2019 20:25:21 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.87]) by SHSMSX105.ccr.corp.intel.com ([169.254.11.72]) with mapi id 14.03.0439.000; Thu, 27 Jun 2019 11:25:20 +0800 From: "Tu, Lijuan" To: "Ma, LihongX" , "dts@dpdk.org" CC: "Zhang, YanX A" , "Ma, LihongX" Thread-Topic: [dts] [PATCH V2] tests/vf_daemon: add rte prefix to ether structures Thread-Index: AQHVF5PL9P1XxgCbC0Sd+eVn9jt86aavALRg Date: Thu, 27 Jun 2019 03:25:19 +0000 Message-ID: <8CE3E05A3F976642AAB0F4675D0AD20E0BAC5916@SHSMSX101.ccr.corp.intel.com> References: <1559268660-4748-1-git-send-email-lihongx.ma@intel.com> In-Reply-To: <1559268660-4748-1-git-send-email-lihongx.ma@intel.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.0.600.7 dlp-reaction: no-action x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiYjg2MTE1YjItYmEyZi00MjQ3LWJjNmMtMWIxZWQzOTkxNTYyIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiYzZsb3ViMXhaa0hmRnd3T09lVkZqT1ZcL0ZVakF4OEJFcGIwXC9mYlAzXC83Y2FOZVZad0NsSGFxWUJjNm1TcEFFWCJ9 x-originating-ip: [10.239.127.40] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dts] [PATCH V2] tests/vf_daemon: add rte prefix to ether structures X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org Sender: "dts" Applied, thanks > -----Original Message----- > From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of lihong > Sent: Friday, May 31, 2019 10:11 AM > To: dts@dpdk.org > Cc: Zhang, YanX A ; Ma, LihongX > > Subject: [dts] [PATCH V2] tests/vf_daemon: add rte prefix to ether struct= ures >=20 > As dpdk commit: 6d13ea8e8e49ab9, add 'rte_' prefix to structures > ether_addr; so change our code related it. >=20 > Signed-off-by: lihong > --- > tests/TestSuite_vf_daemon.py | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) >=20 > diff --git a/tests/TestSuite_vf_daemon.py b/tests/TestSuite_vf_daemon.py > index 2d5c59f..cc55f65 100644 > --- a/tests/TestSuite_vf_daemon.py > +++ b/tests/TestSuite_vf_daemon.py > @@ -487,10 +487,10 @@ class TestVfDaemon(TestCase): > fake_mac =3D '00:11:22:33:44:55' > time.sleep(5) > self.vm0_dut.send_expect("sed -i -e '/int r;/a " +\ > - "\ struct ether_addr fake_mac =3D {.addr_bytes =3D {0= x00, 0x11, 0x22, > 0x33, 0x44, 0x55},};'" +\ > + "\ struct rte_ether_addr fake_mac =3D {.addr_bytes = =3D {0x00, 0x11, > 0x22, 0x33, 0x44, 0x55},};'" +\ > " app/test-pmd/macswap_sse.h", "# ", 30) > line_num =3D self.vm0_dut.send_expect("sed -n '/_mm_storeu_si128= /=3D' > app/test-pmd/macswap_sse.h |sed -n 5p", "# ",30) > - self.vm0_dut.send_expect("sed -i -e '%sa\ether_addr_copy(&fake_m= ac, > ð_hdr[0]->s_addr);'" % str(line_num)+\ > + self.vm0_dut.send_expect("sed -i -e > + '%sa\\rte_ether_addr_copy(&fake_mac, ð_hdr[0]->s_addr);'" % > + str(line_num)+\ > " app/test-pmd/macswap_sse.h", "# ", 30) > time.sleep(3) >=20 > @@ -525,7 +525,7 @@ class TestVfDaemon(TestCase): >=20 > self.vm0_testpmd.quit() > self.dut_testpmd.quit() > - self.vm0_dut.send_expect("sed -i '/struct ether_addr fake_mac = =3D > {.addr_bytes =3D " +\ > + self.vm0_dut.send_expect("sed -i '/struct rte_ether_addr > + fake_mac =3D {.addr_bytes =3D " +\ > "{0x00, 0x11, 0x22, 0x33, 0x44, 0x55},};/d' app/test- > pmd/macswap_sse.h", "# ", 30) > self.vm0_dut.send_expect("sed -i '%sd'" % line_num +\ > " app/test-pmd/macswap_sse.h", "# ", 30) > -- > 2.7.4