qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH] configure: only add CONFIG_RDMA to config-host.h once
@ 2015-07-31 12:23 Daniel P. Berrange
  2015-07-31 13:09 ` Paolo Bonzini
  0 siblings, 1 reply; 2+ messages in thread
From: Daniel P. Berrange @ 2015-07-31 12:23 UTC (permalink / raw)
  To: qemu-devel; +Cc: qemu-trivial

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
-- 
2.4.3

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [Qemu-devel] [PATCH] configure: only add CONFIG_RDMA to config-host.h once
  2015-07-31 12:23 [Qemu-devel] [PATCH] configure: only add CONFIG_RDMA to config-host.h once Daniel P. Berrange
@ 2015-07-31 13:09 ` Paolo Bonzini
  0 siblings, 0 replies; 2+ messages in thread
From: Paolo Bonzini @ 2015-07-31 13:09 UTC (permalink / raw)
  To: Daniel P. Berrange, qemu-devel; +Cc: qemu-trivial



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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-07-31 13:09 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-31 12:23 [Qemu-devel] [PATCH] configure: only add CONFIG_RDMA to config-host.h once Daniel P. Berrange
2015-07-31 13:09 ` Paolo Bonzini

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).