From patchwork Thu Jul 10 11:17:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 33416 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f71.google.com (mail-qa0-f71.google.com [209.85.216.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 64820203F4 for ; Thu, 10 Jul 2014 11:20:58 +0000 (UTC) Received: by mail-qa0-f71.google.com with SMTP id m5sf25710319qaj.6 for ; Thu, 10 Jul 2014 04:20:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:date:from:to:message-id:user-agent :mime-version:cc:subject:precedence:list-id:list-unsubscribe :list-post:list-help:list-subscribe:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list :list-archive:content-type:content-transfer-encoding; bh=+lpa3mrkzSL1wuMGTHPEw81nsJHf8vNbfcNDlAdND1M=; b=FVJP8CgAJPzYq+j+2eFEsy5UebyGNDPyoD19DVl7yvYGacGQO5SA9ElKoM/J9+QKRx N4gnJxUljJr/wYzxOdoz+ltLPI+m3gcxYnVSwpbAPaPy179g0rWuZ7eE58qO58MH8TaF VCzvH0rC4y1ns6HZYgoFfMoRtPQAMV/Wg038uKC9/1ewivT54ttdzcUjFlOnKAqLLBPM xnrDBl5rCWJCsFilEP1D+f6tnU4+ibdw480UxaEFsPmN/Tc6LqUiqQMZbTSO+Xu0L6Mv 0ue2QZ2JiU+Fy8qg7UqPT8+WDF9QY8cg64YfY73RXskPOZvWBhVESUhUpel+qlREfiwp n7Yw== X-Gm-Message-State: ALoCoQkwhYRgl6+xyHwE6vcAMSQqq15ydZa/zAWiCezke/J+29dhMh2vVnv6vMM9Bah5VaTlDMex X-Received: by 10.236.31.40 with SMTP id l28mr19570469yha.34.1404991258253; Thu, 10 Jul 2014 04:20:58 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.51.3 with SMTP id t3ls32328qga.82.gmail; Thu, 10 Jul 2014 04:20:58 -0700 (PDT) X-Received: by 10.58.150.100 with SMTP id uh4mr30847762veb.30.1404991258169; Thu, 10 Jul 2014 04:20:58 -0700 (PDT) Received: from mail-vc0-f173.google.com (mail-vc0-f173.google.com [209.85.220.173]) by mx.google.com with ESMTPS id hi7si22827932veb.3.2014.07.10.04.20.58 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 10 Jul 2014 04:20:58 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.173 as permitted sender) client-ip=209.85.220.173; Received: by mail-vc0-f173.google.com with SMTP id lf12so10085891vcb.4 for ; Thu, 10 Jul 2014 04:20:58 -0700 (PDT) X-Received: by 10.220.2.18 with SMTP id 18mr49843vch.49.1404991258077; Thu, 10 Jul 2014 04:20:58 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp124344vcb; Thu, 10 Jul 2014 04:20:57 -0700 (PDT) X-Received: by 10.140.41.202 with SMTP id z68mr74148078qgz.37.1404991257666; Thu, 10 Jul 2014 04:20:57 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id k2si46524575qao.13.2014.07.10.04.20.57 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 10 Jul 2014 04:20:57 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X5CND-0007Aw-5Y; Thu, 10 Jul 2014 11:18:47 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X5CNC-0007AY-AM for xen-devel@lists.xensource.com; Thu, 10 Jul 2014 11:18:46 +0000 Received: from [85.158.143.35:31364] by server-1.bemta-4.messagelabs.com id 31/17-09496-5967EB35; Thu, 10 Jul 2014 11:18:45 +0000 X-Env-Sender: Stefano.Stabellini@citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1404991123!9757073!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8065 invoked from network); 10 Jul 2014 11:18:45 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-13.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 10 Jul 2014 11:18:45 -0000 X-IronPort-AV: E=Sophos;i="5.01,637,1400025600"; d="scan'208";a="151600602" Received: from accessns.citrite.net (HELO FTLPEX01CL01.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 10 Jul 2014 11:18:43 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.3.181.6; Thu, 10 Jul 2014 07:18:42 -0400 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1X5CN8-0004sP-Ao; Thu, 10 Jul 2014 12:18:42 +0100 Date: Thu, 10 Jul 2014 12:17:56 +0100 From: Stefano Stabellini X-X-Sender: sstabellini@kaball.uk.xensource.com To: Message-ID: User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 X-DLP: MIA2 Cc: Ian Jackson , Ian Campbell , Stefano Stabellini Subject: [Xen-devel] [PATCH] do not add tools/xenstore, libxc to the include path to configure qemu-xen X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: stefano.stabellini@eu.citrix.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.173 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: Do not include headers under tools/xenstore and tools/libxc to build qemu-xen. They contain internal headers that are not supposed to be exported to external programs and can cause conflicts. For example tools/xenstore/utils.h. tools/include already has all the headers qemu-xen needs anyway. Also add libxc and xenstore among qemu-xen dependencies: they need to be already built when configuring qemu-xen because the configure script is going to try to detect if xen is available by compiling a small program that links against libxc and libxenstore. Signed-off-by: Stefano Stabellini diff --git a/tools/Makefile b/tools/Makefile index f4aa200..cc9736c 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -174,7 +174,7 @@ else QEMU_XEN_ENABLE_DEBUG := endif -subdir-all-qemu-xen-dir: qemu-xen-dir-find +subdir-all-qemu-xen-dir: qemu-xen-dir-find include libxc xenstore if test -d $(QEMU_UPSTREAM_URL) ; then \ source=$(QEMU_UPSTREAM_URL); \ else \ @@ -188,9 +188,6 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find --includedir=$(PREFIX)/lib/xen/include \ --source-path=$$source \ --extra-cflags="-I$(XEN_ROOT)/tools/include \ - -I$(XEN_ROOT)/tools/libxc \ - -I$(XEN_ROOT)/tools/xenstore \ - -I$(XEN_ROOT)/tools/xenstore/compat \ $(EXTRA_CFLAGS_QEMU_XEN)" \ --extra-ldflags="-L$(XEN_ROOT)/tools/libxc \ -L$(XEN_ROOT)/tools/xenstore \