From mboxrd@z Thu Jan  1 00:00:00 1970
From: Maxime Coquelin <maxime.coquelin@redhat.com>
Subject: Re: [PATCH v2] drivers/virtio: fix duplicate naming of
	include guard
Date: Wed, 27 Mar 2019 12:13:34 +0100
Message-ID: <c9ba01b0-4229-052d-7aa3-c8212ad428a9@redhat.com>
References: <1553090259-30893-1-git-send-email-andrius.sirvys@intel.com>
 <1553162993-42643-1-git-send-email-andrius.sirvys@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit
Cc: stable@dpdk.org, jianfeng.tan@intel.com
To: Andrius Sirvys <andrius.sirvys@intel.com>, dev@dpdk.org,
 Tiwei Bie <tiwei.bie@intel.com>, Zhihong Wang <zhihong.wang@intel.com>
Return-path: <dev-bounces@dpdk.org>
In-Reply-To: <1553162993-42643-1-git-send-email-andrius.sirvys@intel.com>
Content-Language: en-US
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>



On 3/21/19 11:09 AM, Andrius Sirvys wrote:
> "The macro name '_VHOST_NET_USER_H' of this include guard is used
> in 2 different header files."
> 
> lib/librte_vhost/vhost_user.h has the same include guard.
> Renamed the include guard in vhost.h to differentiate.
> 
> Fixes: 6a84c37e3975 ("net/virtio-user: add vhost-user adapter layer")
> Cc: jianfeng.tan@intel.com
> Signed-off-by: Andrius Sirvys <andrius.sirvys@intel.com>
> Acked-by: Rami Rosen <ramirose@gmail.com>
> ---
> v2: changed the name of the variable
> ---
>   drivers/net/virtio/virtio_user/vhost.h | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/virtio/virtio_user/vhost.h b/drivers/net/virtio/virtio_user/vhost.h
> index 83a85cc..55f4703 100644
> --- a/drivers/net/virtio/virtio_user/vhost.h
> +++ b/drivers/net/virtio/virtio_user/vhost.h
> @@ -2,8 +2,8 @@
>    * Copyright(c) 2010-2016 Intel Corporation
>    */
>   
> -#ifndef _VHOST_NET_USER_H
> -#define _VHOST_NET_USER_H
> +#ifndef _VIRTIO_USER_VHOST_H
> +#define _VIRTIO_USER_VHOST_H
>   
>   #include <stdint.h>
>   #include <linux/types.h>
> 

Applied to dpdk-next-virtio/master.

Next time please run the check-git-log script before posting,
I fixed the issues while applying.

Thanks,
Maxime