From patchwork Thu Jun 9 12:57:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 9166963 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5BAD86048F for ; Thu, 9 Jun 2016 12:59:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4BC9228047 for ; Thu, 9 Jun 2016 12:59:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3C7B928340; Thu, 9 Jun 2016 12:59:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D8BCA21BED for ; Thu, 9 Jun 2016 12:59:51 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bAzX1-0000bS-4B; Thu, 09 Jun 2016 12:57:55 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bAzX0-0000OL-AK for xen-devel@lists.xenproject.org; Thu, 09 Jun 2016 12:57:54 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id BC/CC-31080-EC769575; Thu, 09 Jun 2016 12:57:50 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupjkeJIrShJLcpLzFFi42JxWrrBXvdsemS 4wcdJAhbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8baWR+ZCpbxV3ydeZe9gXEpbxcjJ4eEgL/E 5rtbGUFsNgFliZ+dvWwgtoiAnkTTgedgcWYBL4kX6/6B2cICNhKfn7wAq2ERUJGY8m8DK4jNK +As8fTwDnaImXIS54//ZO5i5ODgFHCRaNjlBBIWAipp7/rIDGErSHRMP8YE0SoocXLmExaIVR ISB1+8AGuVEOCW+NttP4GRbxaSqllIqhYwMq1iVC9OLSpLLdI110sqykzPKMlNzMzRNTQw1ct NLS5OTE/NSUwq1kvOz93ECAwnBiDYwXhssvMhRkkOJiVR3ifWkeFCfEn5KZUZicUZ8UWlOanF hxhlODiUJHgnpQHlBItS01Mr0jJzgIENk5bg4FES4T0CkuYtLkjMLc5Mh0idYlSUEudNAEkIg CQySvPg2mDRdIlRVkqYlxHoECGegtSi3MwSVPlXjOIcjErCvFdApvBk5pXATX8FtJgJaPHyI+ Egi0sSEVJSDYxNs2Z5GUxyMbqt/PVjuv+nZKnzvrncqdadz3/wF79Lb2LLl94tzlymOlnU39q WyzzIK3vpvzVxxd+vLDt2LyFmQw9Pen3M5eKeCxUHN39OjD3yWfXtRvtmc/Y847+ztpvGff1V uvr37P8qH9/KbdGYPmH1arMbvrUH9JbGVk9btODz0jaN37FKLMUZiYZazEXFiQAMuZS9oQIAA A== X-Env-Sender: prvs=9619a384d=wei.liu2@citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1465477063!43850538!4 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 8.46; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6700 invoked from network); 9 Jun 2016 12:57:48 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-8.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 9 Jun 2016 12:57:48 -0000 X-IronPort-AV: E=Sophos;i="5.26,444,1459814400"; d="scan'208";a="366239491" From: Wei Liu To: Xen-devel Date: Thu, 9 Jun 2016 13:57:36 +0100 Message-ID: <1465477062-28805-6-git-send-email-wei.liu2@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1465477062-28805-1-git-send-email-wei.liu2@citrix.com> References: <1465477062-28805-1-git-send-email-wei.liu2@citrix.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: Ian Jackson , Wei Liu Subject: [Xen-devel] [PATCH 05/11] xenbackendd: honour XEN_{RUN,LOG}_DIR X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Also added a gitignore entry for xenbackendd binary while I was there. Signed-off-by: Wei Liu Acked-by: Ian Jackson --- Cc: Ian Jackson --- .gitignore | 2 ++ tools/xenbackendd/Makefile | 6 +++++- tools/xenbackendd/xenbackendd.c | 6 ++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b014509..af0e0a8 100644 --- a/.gitignore +++ b/.gitignore @@ -210,6 +210,8 @@ tools/tests/mem-sharing/memshrtool tools/tests/mce-test/tools/xen-mceinj tools/xcutils/lsevtchn tools/xcutils/readnotes +tools/xenbackendd/_paths.h +tools/xenbackendd/xenbackendd tools/xenmon/xentrace_setmask tools/xenmon/xenbaked tools/xenpaging/xenpaging diff --git a/tools/xenbackendd/Makefile b/tools/xenbackendd/Makefile index f52be74..80ac7f4 100644 --- a/tools/xenbackendd/Makefile +++ b/tools/xenbackendd/Makefile @@ -30,12 +30,16 @@ install: build .PHONY: clean clean: - $(RM) *.a *.so *.o $(DEPS) xenbackendd + $(RM) *.a *.so *.o $(DEPS) xenbackendd _paths.h .PHONY: distclean distclean: clean +xenbackendd.o: _paths.h xenbackendd: xenbackendd.o $(CC) $(LDFLAGS) $< -o $@ $(LDLIBS) $(APPEND_LDFLAGS) +genpath-target = $(call buildmakevars2header,_paths.h) +$(eval $(genpath-target)) + -include $(DEPS) diff --git a/tools/xenbackendd/xenbackendd.c b/tools/xenbackendd/xenbackendd.c index e21464b..b6d9298 100644 --- a/tools/xenbackendd/xenbackendd.c +++ b/tools/xenbackendd/xenbackendd.c @@ -29,6 +29,8 @@ #include +#include "_paths.h" + #define DEVTYPE_UNKNOWN 0 #define DEVTYPE_VIF 1 #define DEVTYPE_VBD 2 @@ -44,10 +46,10 @@ #define VBD_SCRIPT XEN_SCRIPT_DIR"/block" #endif #ifndef LOG_FILE -#define LOG_FILE "/var/log/xen/xenbackendd.log" +#define LOG_FILE XEN_LOG_DIR "xenbackendd.log" #endif #ifndef PID_FILE -#define PID_FILE "/var/run/xenbackendd.pid" +#define PID_FILE XEN_RUN_DIR "xenbackendd.pid" #endif