From patchwork Mon Jun 13 07:48:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 9172257 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 141BA604DB for ; Mon, 13 Jun 2016 07:51:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 064A420499 for ; Mon, 13 Jun 2016 07:51:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EF4C52665D; Mon, 13 Jun 2016 07:51:42 +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 33F4820499 for ; Mon, 13 Jun 2016 07:51:42 +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 1bCMcb-0005ty-9S; Mon, 13 Jun 2016 07:49:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bCMca-0005tO-5j for xen-devel@lists.xenproject.org; Mon, 13 Jun 2016 07:49:20 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id E9/59-29837-F756E575; Mon, 13 Jun 2016 07:49:19 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupnkeJIrShJLcpLzFFi42JxWrohUrcuNS7 cYO8UbYvvWyYzOTB6HP5whSWAMYo1My8pvyKBNeP0ngWsBYeUKpa+PMrUwLhHrouRk0NCwF9i 37NeJhCbTUBZ4mdnLxuILSKgJ9F04DkjiM0soChx6vYMZhBbWMBP4sX19WD1LAKqEt1/DoDZv ALOEmfnrmCBmCkncf74T6B6Dg5OAReJJ+/MQcJCQCUNsw4zQ9gKEh3Tj0G1CkqcnPmEBWKVhM TBFy/AWiUEuCX+dttPYOSbhaRqFpKqBYxMqxg1ilOLylKLdA3N9JKKMtMzSnITM3N0DQ1M9XJ Ti4sT01NzEpOK9ZLzczcxAgOKAQh2MJ4/7XmIUZKDSUmUV8InLlyILyk/pTIjsTgjvqg0J7X4 EKMMB4eSBO/+FKCcYFFqempFWmYOMLRh0hIcPEoivMdB0rzFBYm5xZnpEKlTjIpS4rxxIAkBk ERGaR5cGyyeLjHKSgnzMgIdIsRTkFqUm1mCKv+KUZyDUUmYdy/IFJ7MvBK46a+AFjMBLebYFw 2yuCQRISXVwKi59fu8B7dsGq0VylLOTb4Rd2i+5bZdK9NWe5Yy7mZjzcreqvbpRcOFvW+jdyf qXfDS9Y3ifhjC2P5f+7B5cED2h2NbV6448rii+5Xy14bfdYJCMeeV26cHngpmrv56W99Ywtjv 5scHHDGtLu05Il/3H2zyuXS89+Oedz3Nk27H6z3w1Dz8KFSJpTgj0VCLuag4EQBuOkOWogIAA A== X-Env-Sender: prvs=9655a08af=wei.liu2@citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1465804157!44533302!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 21720 invoked from network); 13 Jun 2016 07:49:18 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-5.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 13 Jun 2016 07:49:18 -0000 X-IronPort-AV: E=Sophos;i="5.26,466,1459814400"; d="scan'208";a="359992697" From: Wei Liu To: Xen-devel Date: Mon, 13 Jun 2016 08:48:59 +0100 Message-ID: <1465804155-14469-2-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: Wei Liu Subject: [Xen-devel] [PATCH 01/17] oxenstored: honour XEN_{LOG, RUN}_DIR in oxenstored.conf 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 Generate oxenstored.conf with configure. This involves modifying tools/configure.ac and rerun autogen.sh. Signed-off-by: Wei Liu Acked-by: Ian Jackson --- .gitignore | 1 + tools/configure | 3 ++- tools/configure.ac | 1 + tools/ocaml/xenstored/{oxenstored.conf => oxenstored.conf.in} | 6 +++--- 4 files changed, 7 insertions(+), 4 deletions(-) rename tools/ocaml/xenstored/{oxenstored.conf => oxenstored.conf.in} (84%) diff --git a/.gitignore b/.gitignore index af0e0a8..39deb2d 100644 --- a/.gitignore +++ b/.gitignore @@ -346,6 +346,7 @@ tools/ocaml/libs/xentoollog/_xtl_levels.* tools/ocaml/libs/xentoollog/xentoollog.ml tools/ocaml/libs/xentoollog/xentoollog.mli tools/ocaml/xenstored/oxenstored +tools/ocaml/xenstored/oxenstored.conf tools/ocaml/test/xtl tools/ocaml/test/send_debug_keys tools/ocaml/test/list_domains diff --git a/tools/configure b/tools/configure index a80f132..42e07a6 100755 --- a/tools/configure +++ b/tools/configure @@ -2408,7 +2408,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_config_files="$ac_config_files ../config/Tools.mk hotplug/FreeBSD/rc.d/xencommons hotplug/FreeBSD/rc.d/xendriverdomain hotplug/Linux/init.d/sysconfig.xencommons hotplug/Linux/init.d/xen-watchdog hotplug/Linux/init.d/xencommons hotplug/Linux/init.d/xendomains hotplug/Linux/init.d/xendriverdomain hotplug/Linux/vif-setup hotplug/Linux/xen-hotplug-common.sh hotplug/Linux/xendomains hotplug/NetBSD/rc.d/xencommons hotplug/NetBSD/rc.d/xendriverdomain libxl/xenlight.pc.in libxl/xlutil.pc.in" +ac_config_files="$ac_config_files ../config/Tools.mk hotplug/FreeBSD/rc.d/xencommons hotplug/FreeBSD/rc.d/xendriverdomain hotplug/Linux/init.d/sysconfig.xencommons hotplug/Linux/init.d/xen-watchdog hotplug/Linux/init.d/xencommons hotplug/Linux/init.d/xendomains hotplug/Linux/init.d/xendriverdomain hotplug/Linux/vif-setup hotplug/Linux/xen-hotplug-common.sh hotplug/Linux/xendomains hotplug/NetBSD/rc.d/xencommons hotplug/NetBSD/rc.d/xendriverdomain libxl/xenlight.pc.in libxl/xlutil.pc.in ocaml/xenstored/oxenstored.conf" ac_config_headers="$ac_config_headers config.h" @@ -10374,6 +10374,7 @@ do "hotplug/NetBSD/rc.d/xendriverdomain") CONFIG_FILES="$CONFIG_FILES hotplug/NetBSD/rc.d/xendriverdomain" ;; "libxl/xenlight.pc.in") CONFIG_FILES="$CONFIG_FILES libxl/xenlight.pc.in" ;; "libxl/xlutil.pc.in") CONFIG_FILES="$CONFIG_FILES libxl/xlutil.pc.in" ;; + "ocaml/xenstored/oxenstored.conf") CONFIG_FILES="$CONFIG_FILES ocaml/xenstored/oxenstored.conf" ;; "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "hotplug/Linux/systemd/proc-xen.mount") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/systemd/proc-xen.mount" ;; "hotplug/Linux/systemd/var-lib-xenstored.mount") CONFIG_FILES="$CONFIG_FILES hotplug/Linux/systemd/var-lib-xenstored.mount" ;; diff --git a/tools/configure.ac b/tools/configure.ac index d0c9e63..2e5c95c 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -21,6 +21,7 @@ hotplug/NetBSD/rc.d/xencommons hotplug/NetBSD/rc.d/xendriverdomain libxl/xenlight.pc.in libxl/xlutil.pc.in +ocaml/xenstored/oxenstored.conf ]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_AUX_DIR([../]) diff --git a/tools/ocaml/xenstored/oxenstored.conf b/tools/ocaml/xenstored/oxenstored.conf.in similarity index 84% rename from tools/ocaml/xenstored/oxenstored.conf rename to tools/ocaml/xenstored/oxenstored.conf.in index ac60f49..82117a9 100644 --- a/tools/ocaml/xenstored/oxenstored.conf +++ b/tools/ocaml/xenstored/oxenstored.conf.in @@ -1,7 +1,7 @@ # default xenstored config # Where the pid file is stored -pid-file = /var/run/xenstored.pid +pid-file = @XEN_RUN_DIR@/xenstored.pid # Randomly failed a transaction with EAGAIN. Used for testing Xs user test-eagain = false @@ -24,12 +24,12 @@ quota-maxrequests = 1024 persistent = false # Xenstored logs -# xenstored-log-file = /var/log/xenstored.log +# xenstored-log-file = @XEN_LOG_DIR@/xenstored.log # xenstored-log-level = null # xenstored-log-nb-files = 10 # Xenstored access logs -# access-log-file = /var/log/xenstored-access.log +# access-log-file = @XEN_LOG_DIR@/xenstored-access.log # access-log-nb-lines = 13215 # acesss-log-nb-chars = 180 # access-log-special-ops = false