Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F43BC55179 for ; Fri, 23 Oct 2020 14:20:00 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1C38D2168B for ; Fri, 23 Oct 2020 14:19:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="VOpIkOSh" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1C38D2168B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.11015.29253 (Exim 4.92) (envelope-from ) id 1kVxuz-0000q5-10; Fri, 23 Oct 2020 14:19:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 11015.29253; Fri, 23 Oct 2020 14:19:44 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kVxuy-0000pw-Tv; Fri, 23 Oct 2020 14:19:44 +0000 Received: by outflank-mailman (input) for mailman id 11015; Fri, 23 Oct 2020 14:19:43 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kVxux-0000me-Li for xen-devel@lists.xenproject.org; Fri, 23 Oct 2020 14:19:43 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id e36debdc-7f34-4275-b6a0-68932db8629c; Fri, 23 Oct 2020 14:19:38 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 51A85B2AE; Fri, 23 Oct 2020 14:19:37 +0000 (UTC) Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kVxux-0000me-Li for xen-devel@lists.xenproject.org; Fri, 23 Oct 2020 14:19:43 +0000 X-Inumbo-ID: e36debdc-7f34-4275-b6a0-68932db8629c Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id e36debdc-7f34-4275-b6a0-68932db8629c; Fri, 23 Oct 2020 14:19:38 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1603462777; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hnG6mBS9gSVm05A1WvJ2mFbfRf9HUb0Klxqf2yEGtiU=; b=VOpIkOShAiYoVQ1Z1LvjYBSS54URrWcvP2/Reabmd31f6qX9kAni+cmJZQfeadW3yIMAHQ 9YqLBIApz9GgEoetRJpQWmYURjUzbwrDujymf2OOFVaXTfmf3JF7ASqz6uVJMAlR4sWab0 VQnBclxUxEvJfUNiN2r22dTu/ksXQ0Q= Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 51A85B2AE; Fri, 23 Oct 2020 14:19:37 +0000 (UTC) From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Ian Jackson , Wei Liu , Christian Lindig , Bertrand Marquis Subject: [PATCH v2 2/3] tools/libs/guest: don't use symbolic links for xenctrl headers Date: Fri, 23 Oct 2020 16:19:33 +0200 Message-Id: <20201023141934.20062-3-jgross@suse.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201023141934.20062-1-jgross@suse.com> References: <20201023141934.20062-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Instead of using symbolic links for accessing the xenctrl private headers use an include path instead. Signed-off-by: Juergen Gross Acked-by: Christian Lindig Tested-by: Bertrand Marquis --- tools/libs/guest/Makefile | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/tools/libs/guest/Makefile b/tools/libs/guest/Makefile index 5b4ad313cc..1c729040b3 100644 --- a/tools/libs/guest/Makefile +++ b/tools/libs/guest/Makefile @@ -6,11 +6,6 @@ ifeq ($(CONFIG_LIBXC_MINIOS),y) override CONFIG_MIGRATE := n endif -LINK_FILES := xc_private.h xc_core.h xc_core_x86.h xc_core_arm.h xc_bitops.h - -$(LINK_FILES): - ln -sf $(XEN_ROOT)/tools/libs/ctrl/$(notdir $@) $@ - SRCS-y += xg_private.c SRCS-y += xg_domain.c SRCS-y += xg_suspend.c @@ -29,6 +24,8 @@ else SRCS-y += xg_nomigrate.c endif +CFLAGS += -I$(XEN_libxenctrl) + vpath %.c ../../../xen/common/libelf CFLAGS += -I../../../xen/common/libelf @@ -111,8 +108,6 @@ $(eval $(genpath-target)) xc_private.h: _paths.h -$(LIB_OBJS) $(PIC_OBJS): $(LINK_FILES) - .PHONY: cleanlocal cleanlocal: rm -f libxenguest.map -- 2.26.2