From patchwork Mon Jun 13 07:49:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 9172301 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 E152E604DB for ; Mon, 13 Jun 2016 08:37:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D4D7521C9A for ; Mon, 13 Jun 2016 08:37:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C9CDF265B9; Mon, 13 Jun 2016 08:37:41 +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 66AE221C9A for ; Mon, 13 Jun 2016 08:37:41 +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 1bCNKb-00046G-D4; Mon, 13 Jun 2016 08:34:49 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bCNKZ-00045z-U8 for xen-devel@lists.xenproject.org; Mon, 13 Jun 2016 08:34:48 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id BF/0C-22080-7207E575; Mon, 13 Jun 2016 08:34:47 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupjkeJIrShJLcpLzFFi42JxWrohUletIC7 cYNEDHYvvWyYzOTB6HP5whSWAMYo1My8pvyKBNePYsSUsBQc4Kk7efs3YwLiPvYuRk0NCwF9i +oOjTCA2m4CyxM/OXjYQW0RAT6LpwHNGEJtZwEvixbp/YLawgKXExLObwepZBFQlbq9eBGbzC rhILNrynAlippzE+eM/mbsYOTg4geJP3pmDhIUEnCUaZh1mhrAVJDqmH4NqFZQ4OfMJC8QqCY mDL16AtUoIcEv87bafwMg3C0nVLCRVCxiZVjGqF6cWlaUW6RrpJRVlpmeU5CZm5ugaGpro5aY WFyemp+YkJhXrJefnbmIEhhMDEOxgbJnjfIhRkoNJSZRXwicuXIgvKT+lMiOxOCO+qDQntfgQ owwHh5IEb3ceUE6wKDU9tSItMwcY2DBpCQ4eJRHelSBp3uKCxNzizHSI1ClGRSlx3miQhABII qM0D64NFk2XGGWlhHkZgQ4R4ilILcrNLEGVf8UozsGoJMzbCzKFJzOvBG76K6DFTECLOfZFgy wuSURISTUwKn4U3b9RTk8uz0fkpvbci8rlGgt4kxftdLgvt51xs/HGyAPXU0y2KbnybV/80om 3Y7NgoVPWBcfsltgS44/s/mv+iFTUv7VevubEuj1/XZgWLWB2DDGa+ezLJ6/GPzcaXPb9zTqS 1y+1Ncp2tdQ59ZVKQdKPn58O2DX/P5/Y6gbHBb6ut91blFiKMxINtZiLihMBB6laZqECAAA= X-Env-Sender: prvs=9655a08af=wei.liu2@citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1465806885!47323807!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 8.46; banners=-,-,- X-VirusChecked: Checked Received: (qmail 432 invoked from network); 13 Jun 2016 08:34:46 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-5.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 13 Jun 2016 08:34:46 -0000 X-IronPort-AV: E=Sophos;i="5.26,466,1459814400"; d="scan'208";a="359999583" From: Wei Liu To: Xen-devel Date: Mon, 13 Jun 2016 08:49:10 +0100 Message-ID: <1465804155-14469-13-git-send-email-wei.liu2@citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1465804155-14469-1-git-send-email-wei.liu2@citrix.com> References: <1465804155-14469-1-git-send-email-wei.liu2@citrix.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: Ian Jackson , Wei Liu Subject: [Xen-devel] [PATCH 12/17] libxenstore: honour XEN_RUN_STORED 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 Signed-off-by: Wei Liu Acked-by: Ian Jackson --- Cc: Ian Jackson --- tools/xenstore/Makefile | 1 + tools/xenstore/xs_lib.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index d691b78..36b6fd4 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -12,6 +12,7 @@ CFLAGS += -I./include CFLAGS += $(CFLAGS_libxenevtchn) CFLAGS += $(CFLAGS_libxenctrl) CFLAGS += -DXEN_LIB_STORED="\"$(XEN_LIB_STORED)\"" +CFLAGS += -DXEN_RUN_STORED="\"$(XEN_RUN_STORED)\"" CFLAGS-$(CONFIG_SYSTEMD) += $(SYSTEMD_CFLAGS) LDFLAGS-$(CONFIG_SYSTEMD) += $(SYSTEMD_LIBS) diff --git a/tools/xenstore/xs_lib.c b/tools/xenstore/xs_lib.c index 0c7744e..6568e82 100644 --- a/tools/xenstore/xs_lib.c +++ b/tools/xenstore/xs_lib.c @@ -35,7 +35,7 @@ const char *xs_daemon_rootdir(void) const char *xs_daemon_rundir(void) { char *s = getenv("XENSTORED_RUNDIR"); - return (s ? s : "/var/run/xenstored"); + return (s ? s : XEN_RUN_STORED); } static const char *xs_daemon_path(void)