From patchwork Wed Aug 12 13:37:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 506613 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id D410B1401B5 for ; Wed, 12 Aug 2015 23:42:35 +1000 (AEST) Received: from localhost ([::1]:38692 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZPWIb-0006pt-Ov for incoming@patchwork.ozlabs.org; Wed, 12 Aug 2015 09:42:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43132) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZPWDw-0002CA-7c for qemu-devel@nongnu.org; Wed, 12 Aug 2015 09:37:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZPWDv-0002hj-Az for qemu-devel@nongnu.org; Wed, 12 Aug 2015 09:37:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39605) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZPWDv-0002ha-5p for qemu-devel@nongnu.org; Wed, 12 Aug 2015 09:37:43 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id C936691C09 for ; Wed, 12 Aug 2015 13:37:42 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-112-82.ams2.redhat.com [10.36.112.82]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t7CDbETm004849; Wed, 12 Aug 2015 09:37:41 -0400 From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 12 Aug 2015 15:37:08 +0200 Message-Id: <1439386633-18933-16-git-send-email-pbonzini@redhat.com> In-Reply-To: <1439386633-18933-1-git-send-email-pbonzini@redhat.com> References: <1439386633-18933-1-git-send-email-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 15/20] configure: only add CONFIG_RDMA to config-host.h once X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: "Daniel P. Berrange" For unknown reasons (probably a git rebase merge mistake) commit 2da776db4846eadcb808598a5d3484d149773c05 Author: Michael R. Hines 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 Message-Id: <1438345403-32467-1-git-send-email-berrange@redhat.com> Signed-off-by: Paolo Bonzini --- configure | 4 ---- 1 file changed, 4 deletions(-) diff --git a/configure b/configure index 28bf755..a19e8ec 100755 --- a/configure +++ b/configure @@ -5646,10 +5646,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