From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:51446)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1ZLA3v-0005ar-0t
	for qemu-devel@nongnu.org; Fri, 31 Jul 2015 09:09:28 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1ZLA3u-0002jO-8q
	for qemu-devel@nongnu.org; Fri, 31 Jul 2015 09:09:22 -0400
Sender: Paolo Bonzini <paolo.bonzini@gmail.com>
References: <1438345403-32467-1-git-send-email-berrange@redhat.com>
From: Paolo Bonzini <pbonzini@redhat.com>
Message-ID: <55BB7377.2010109@redhat.com>
Date: Fri, 31 Jul 2015 15:09:11 +0200
MIME-Version: 1.0
In-Reply-To: <1438345403-32467-1-git-send-email-berrange@redhat.com>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH] configure: only add CONFIG_RDMA to
	config-host.h once
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: "Daniel P. Berrange" <berrange@redhat.com>, qemu-devel@nongnu.org
Cc: qemu-trivial@nongnu.org



On 31/07/2015 14:23, Daniel P. Berrange wrote:
> For unknown reasons (probably a git rebase merge mistake)
> 
>   commit 2da776db4846eadcb808598a5d3484d149773c05
>   Author: Michael R. Hines <mrhines@us.ibm.com>
>   Date:   Mon Jul 22 10:01:54 2013 -0400
> 
>     rdma: core logic
> 
> Adds CONFIG_RDMA to config-host.h twice, as can be seen
> in the generated file:
> 
>  $ grep CONFIG_RDMA config-host.h
>  #define CONFIG_RDMA 1
>  #define CONFIG_RDMA 1
> 
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> ---
>  configure | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/configure b/configure
> index a14dc44..8f35400b 100755
> --- a/configure
> +++ b/configure
> @@ -5635,10 +5635,6 @@ if [ "$pixman" = "internal" ]; then
>    echo "config-host.h: subdir-pixman" >> $config_host_mak
>  fi
>  
> -if test "$rdma" = "yes" ; then
> -echo "CONFIG_RDMA=y" >> $config_host_mak
> -fi
> -
>  if [ "$dtc_internal" = "yes" ]; then
>    echo "config-host.h: subdir-dtc" >> $config_host_mak
>  fi
> 

Picked up for 2.5, thanks.

Paolo