From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id BE0A71B298; Sun, 11 Feb 2018 05:03:56 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Feb 2018 20:03:55 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,493,1511856000"; d="scan'208";a="30490614" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by orsmga001.jf.intel.com with ESMTP; 10 Feb 2018 20:03:55 -0800 Received: from fmsmsx120.amr.corp.intel.com (10.18.124.208) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.319.2; Sat, 10 Feb 2018 20:03:55 -0800 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by fmsmsx120.amr.corp.intel.com (10.18.124.208) with Microsoft SMTP Server (TLS) id 14.3.319.2; Sat, 10 Feb 2018 20:03:54 -0800 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.116]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.130]) with mapi id 14.03.0319.002; Sun, 11 Feb 2018 12:03:52 +0800 From: "Tan, Jianfeng" To: "Kulasek, TomaszX" , "yliu@fridaylinux.org" CC: "dev@dpdk.org" , "Xie, Huawei" , "stable@dpdk.org" , "Walker, Benjamin" Thread-Topic: [dpdk-dev] [PATCH] vhost: fix remove macro name conflict Thread-Index: AQHTocsB1wqHw2nWBki7hblW/HNznKOelokA Date: Sun, 11 Feb 2018 04:03:52 +0000 Message-ID: References: <20180209172408.14976-1-tomaszx.kulasek@intel.com> In-Reply-To: <20180209172408.14976-1-tomaszx.kulasek@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: 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: [dpdk-dev] [PATCH] vhost: fix remove macro name conflict X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Feb 2018 04:03:57 -0000 > -----Original Message----- > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Tomasz Kulasek > Sent: Saturday, February 10, 2018 1:24 AM > To: yliu@fridaylinux.org > Cc: dev@dpdk.org; Xie, Huawei; stable@dpdk.org; Walker, Benjamin > Subject: [dpdk-dev] [PATCH] vhost: fix remove macro name conflict >=20 > LOG_DEBUG is a symbol defined by POSIX, so if sys/log.h is > included the symbols conflict. >=20 > This patch changes LOG_DEBUG to VHOST_LOG_DEBUG. >=20 > Fixes: 1c01d52392d5 ("vhost: add debug print") > Cc: huawei.xie@intel.com > Cc: stable@dpdk.org >=20 > Signed-off-by: Ben Walker > Signed-off-by: Tomasz Kulasek Reviewed-by: Jianfeng Tan > --- > lib/librte_vhost/vhost.h | 13 +++++++------ > lib/librte_vhost/vhost_user.c | 10 +++++----- > lib/librte_vhost/virtio_net.c | 16 ++++++++-------- > 3 files changed, 20 insertions(+), 19 deletions(-) >=20 > diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h > index d947bc9e3..319cc6620 100644 > --- a/lib/librte_vhost/vhost.h > +++ b/lib/librte_vhost/vhost.h > @@ -296,8 +296,9 @@ vhost_log_used_vring(struct virtio_net *dev, struct > vhost_virtqueue *vq, >=20 > #ifdef RTE_LIBRTE_VHOST_DEBUG > #define VHOST_MAX_PRINT_BUFF 6072 > -#define LOG_LEVEL RTE_LOG_DEBUG > -#define LOG_DEBUG(log_type, fmt, args...) RTE_LOG(DEBUG, log_type, fmt, > ##args) > +#define VHOST_LOG_LEVEL RTE_LOG_DEBUG Seems that we can remove LOG_LEVEL definition. But it's another issue. Thanks, Jianfeng