From patchwork Wed Oct 2 17:05:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olaf Hering X-Patchwork-Id: 11171677 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6DA2F112B for ; Wed, 2 Oct 2019 17:10:34 +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 492882086A for ; Wed, 2 Oct 2019 17:10:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=aepfle.de header.i=@aepfle.de header.b="ZNaEFnn9" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 492882086A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=aepfle.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iFi7h-0007MA-B5; Wed, 02 Oct 2019 17:09:09 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iFi7e-0007Lx-Qm for xen-devel@lists.xenproject.org; Wed, 02 Oct 2019 17:09:07 +0000 X-Inumbo-ID: 567b3ad2-e537-11e9-b588-bc764e2007e4 Received: from mo6-p00-ob.smtp.rzone.de (unknown [2a01:238:20a:202:5300::1]) by localhost (Halon) with ESMTPS id 567b3ad2-e537-11e9-b588-bc764e2007e4; Wed, 02 Oct 2019 17:09:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1570036144; s=strato-dkim-0002; d=aepfle.de; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: X-RZG-CLASS-ID:X-RZG-AUTH:From:Subject:Sender; bh=GbzhYxVr4PKOxK24SXzYvDJKwRH20NVwyGDYZAtBo0w=; b=ZNaEFnn9Bm/KS0S22PbQRXayVvHGrexIfODuXrjJzqK3UrMfnhSVF9+EPAoks7iZxo 7uLpqoIwm8UU0CXpedykBVYx5CmoSR9VLaWwmbsgwdqGP4KGDmu6fHn97rO3WCp7whXy 4UyR9D3UrzgpGPUuJOsA8m2JFo9YFFoYg5onichH/eMuluDGaJe2CDSK/T4B2sN9Q3cX MJVJzu+C15M5uPjYHJsjVXfjqTcPJ+LEZFKvdPSTKpoJETMQzo336UyX1rqVoIe+UQQG 7q3uBIjdcTPKE+5g7nJwpNeVfHBVtgO6CpPKuOk8LtMUHvLSAoIeN4d6Cb6TfsGVOUKp UOqw== X-RZG-AUTH: ":P2EQZWCpfu+qG7CngxMFH1J+3q8wa/QXkBR9MXjAuzBW/OdlBZQ4AHSS2Gkg" X-RZG-CLASS-ID: mo00 Received: from sender by smtp.strato.de (RZmta 44.28.0 SBL|AUTH) with ESMTPSA id j06a90v92H5kUVc (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA)) (Client did not present a certificate); Wed, 2 Oct 2019 19:05:46 +0200 (CEST) From: Olaf Hering To: xen-devel@lists.xenproject.org Date: Wed, 2 Oct 2019 19:05:36 +0200 Message-Id: <20191002170543.26571-2-olaf@aepfle.de> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20191002170543.26571-1-olaf@aepfle.de> References: <20191002170543.26571-1-olaf@aepfle.de> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH v2 1/8] stubdom/vtpm: include stdio.h for declaration of printf X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Samuel Thibault , Olaf Hering , Quan Xu , Daniel De Graaf Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" The function read_vtpmblk uses printf(3), but stdio.h is not included in this file. This results in a warning from gcc-7: vtpmblk.c: In function 'read_vtpmblk': vtpmblk.c:322:7: warning: implicit declaration of function 'printf' [-Wimplicit-function-declaration] printf("Expected: "); vtpmblk.c:322:7: warning: incompatible implicit declaration of built-in function 'printf' vtpmblk.c:322:7: note: include '' or provide a declaration of 'printf' Signed-off-by: Olaf Hering cked-by: Daniel De Graaf Reviewed-by: Samuel Thibault --- stubdom/vtpm/vtpmblk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/stubdom/vtpm/vtpmblk.c b/stubdom/vtpm/vtpmblk.c index fe529ab5ac..681f0c01b6 100644 --- a/stubdom/vtpm/vtpmblk.c +++ b/stubdom/vtpm/vtpmblk.c @@ -20,6 +20,7 @@ #include #include #include +#include /*Encryption key and block sizes */ #define BLKSZ 16 From patchwork Wed Oct 2 17:05:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olaf Hering X-Patchwork-Id: 11171653 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7284A76 for ; Wed, 2 Oct 2019 17:07:22 +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 4E3962086A for ; Wed, 2 Oct 2019 17:07:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=aepfle.de header.i=@aepfle.de header.b="sFXgiJvG" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4E3962086A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=aepfle.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iFi4a-0006YV-IY; Wed, 02 Oct 2019 17:05:56 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iFi4Z-0006YH-FU for xen-devel@lists.xenproject.org; Wed, 02 Oct 2019 17:05:55 +0000 X-Inumbo-ID: e497ff68-e536-11e9-8628-bc764e2007e4 Received: from mo6-p01-ob.smtp.rzone.de (unknown [2a01:238:20a:202:5301::9]) by localhost (Halon) with ESMTPS id e497ff68-e536-11e9-8628-bc764e2007e4; Wed, 02 Oct 2019 17:05:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1570035953; s=strato-dkim-0002; d=aepfle.de; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: X-RZG-CLASS-ID:X-RZG-AUTH:From:Subject:Sender; bh=4DYp51Vc9ztkdEHMvY1HqDsmG8RHkVlIlHFvANw7/Sw=; b=sFXgiJvG19mceTyuq1g40w0suxrVbwWHMsaQDz/BPa2w6HkbWDcNpgM1w2UvCgBc2Q GmElUxlkKvVr8WZtPaGeDIhjlM4xfq6Ug26cyynyJrXNfib2rOHQv2/0PFxfvscWSPNM 2PRNV+8WX3NmDJ+aEEodk2tA5Kjwh2wxgtjpaSOFhzbwqKvmE4i6BKmCmWyjjFWGLd13 7CezK3VRqQr9OeqMavzVtsbzs6TENhVYTqIo+dHJOTloSiVStGv99uABOl5Yl2SfQZ1M YvhgfBh2ihmphMQ1D1YYGgr4j4yXQ4J0DyOcx5aYahPYf3AG0r5nwpMJeRx31oIPrt1/ V24Q== X-RZG-AUTH: ":P2EQZWCpfu+qG7CngxMFH1J+3q8wa/QXkBR9MXjAuzBW/OdlBZQ4AHSS2Gkg" X-RZG-CLASS-ID: mo00 Received: from sender by smtp.strato.de (RZmta 44.28.0 SBL|AUTH) with ESMTPSA id j06a90v92H5lUVd (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA)) (Client did not present a certificate); Wed, 2 Oct 2019 19:05:47 +0200 (CEST) From: Olaf Hering To: xen-devel@lists.xenproject.org Date: Wed, 2 Oct 2019 19:05:37 +0200 Message-Id: <20191002170543.26571-3-olaf@aepfle.de> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20191002170543.26571-1-olaf@aepfle.de> References: <20191002170543.26571-1-olaf@aepfle.de> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH v2 2/8] tools: add with-xen-scriptdir configure option X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Olaf Hering , Ian Jackson , Wei Liu Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" In the near future all fresh installations will have an empty /etc. The content of this directory will not be controlled by the package manager anymore. One of the reasons for this move is to make snapshots more robust. As a first step into this direction, add a knob to configure to allow storing the hotplug scripts to libexec because they are not exactly configuration. The current default is unchanged, which is /etc/xen/scripts. Signed-off-by: Olaf Hering --- m4/paths.m4 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/m4/paths.m4 b/m4/paths.m4 index 89d3bb8312..0cec2bb190 100644 --- a/m4/paths.m4 +++ b/m4/paths.m4 @@ -70,6 +70,12 @@ AC_ARG_WITH([libexec-leaf-dir], [libexec_subdir=$withval], [libexec_subdir=$PACKAGE_TARNAME]) +AC_ARG_WITH([xen-scriptdir], + AS_HELP_STRING([--with-xen-scriptdir=DIR], + [Path to directory for dom0 hotplug scripts. [SYSCONFDIR/xen/scripts]]), + [xen_scriptdir_path=$withval], + [xen_scriptdir_path=$sysconfdir/xen/scripts]) + AC_ARG_WITH([xen-dumpdir], AS_HELP_STRING([--with-xen-dumpdir=DIR], [Path to directory for domU crash dumps. [LOCALSTATEDIR/lib/xen/dump]]), @@ -137,7 +143,7 @@ AC_SUBST(INITD_DIR) XEN_CONFIG_DIR=$CONFIG_DIR/xen AC_SUBST(XEN_CONFIG_DIR) -XEN_SCRIPT_DIR=$XEN_CONFIG_DIR/scripts +XEN_SCRIPT_DIR=$xen_scriptdir_path AC_SUBST(XEN_SCRIPT_DIR) case "$host_os" in From patchwork Wed Oct 2 17:05:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olaf Hering X-Patchwork-Id: 11171667 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 61A8B14DB for ; Wed, 2 Oct 2019 17:07:53 +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 3C3462086A for ; Wed, 2 Oct 2019 17:07:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=aepfle.de header.i=@aepfle.de header.b="o2YuLZCE" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3C3462086A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=aepfle.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iFi53-0006nk-Pz; Wed, 02 Oct 2019 17:06:25 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iFi52-0006nG-Vx for xen-devel@lists.xenproject.org; Wed, 02 Oct 2019 17:06:25 +0000 X-Inumbo-ID: f3de729a-e536-11e9-bf31-bc764e2007e4 Received: from mo6-p01-ob.smtp.rzone.de (unknown [2a01:238:20a:202:5301::5]) by localhost (Halon) with ESMTPS id f3de729a-e536-11e9-bf31-bc764e2007e4; Wed, 02 Oct 2019 17:06:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1570035979; s=strato-dkim-0002; d=aepfle.de; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: X-RZG-CLASS-ID:X-RZG-AUTH:From:Subject:Sender; bh=Xtwg9ai18ZvoT3lpie3awnF4TPLWhIgCby5hhsaPIvE=; b=o2YuLZCE2HfAE02rEPZp0PqGtrZKvk1Gw8RwXCApJcdh0H6EHMoIr4dtAOS66wObbW RQ19Zsh5DMMo6KW2F0IT1rc7UgKttegkPbFBwRuaBY+x3wLi9nkY5Haz01qWo0Tk1hDD xgFHuvSMVfz72pHEa2yxgVvZvlMzkxhXHqYZrVMX7Xz6alA01kydo1wDsb2WP/QSgfBQ F34eFXsHLrsQd6nkpn5IEzzOsnRpQatlV47F8TE3PeJxeE4dPno/snxrKOp479KQVB7C A0x+9JqS5SMYtDMBIrBrp2kv/hTFtp9TSGXIlwiKrbCBcG2SlvNEsTHSA5RxUVC/bc6b aUUg== X-RZG-AUTH: ":P2EQZWCpfu+qG7CngxMFH1J+3q8wa/QXkBR9MXjAuzBW/OdlBZQ4AHSS2Gkg" X-RZG-CLASS-ID: mo00 Received: from sender by smtp.strato.de (RZmta 44.28.0 SBL|AUTH) with ESMTPSA id j06a90v92H5lUVe (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA)) (Client did not present a certificate); Wed, 2 Oct 2019 19:05:47 +0200 (CEST) From: Olaf Hering To: xen-devel@lists.xenproject.org Date: Wed, 2 Oct 2019 19:05:38 +0200 Message-Id: <20191002170543.26571-4-olaf@aepfle.de> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20191002170543.26571-1-olaf@aepfle.de> References: <20191002170543.26571-1-olaf@aepfle.de> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH v2 3/8] Use XEN_SCRIPT_DIR to refer to /etc/xen/scripts X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Olaf Hering , Stefano Stabellini , Julien Grall , Wei Liu , Konrad Rzeszutek Wilk , George Dunlap , Andrew Cooper , Ian Jackson , Tim Deegan , Jan Beulich Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Replace all hardcoded paths to use XEN_SCRIPT_DIR to expand the actual location. Update .gitignore. Signed-off-by: Olaf Hering --- .gitignore | 3 +++ docs/configure.ac | 3 +++ .../{xl-disk-configuration.5.pod => xl-disk-configuration.5.pod.in} | 2 +- ...etwork-configuration.5.pod => xl-network-configuration.5.pod.in} | 4 ++-- docs/man/xl.1.pod.in | 2 +- docs/man/{xl.conf.5.pod => xl.conf.5.pod.in} | 6 +++--- docs/misc/block-scripts.txt | 2 +- tools/xl/xl_cmdtable.c | 2 +- 8 files changed, 15 insertions(+), 9 deletions(-) rename docs/man/{xl-disk-configuration.5.pod => xl-disk-configuration.5.pod.in} (99%) rename docs/man/{xl-network-configuration.5.pod => xl-network-configuration.5.pod.in} (98%) rename docs/man/{xl.conf.5.pod => xl.conf.5.pod.in} (97%) diff --git a/.gitignore b/.gitignore index 3ada0c4f0b..5aa4201d34 100644 --- a/.gitignore +++ b/.gitignore @@ -47,7 +47,10 @@ dist/* docs/tmp.* docs/html/ docs/man/xl.cfg.5.pod +docs/man/xl-disk-configuration.5.pod +docs/man/xl-network-configuration.5.pod docs/man/xl.1.pod +docs/man/xl.conf.5.pod docs/man1/ docs/man5/ docs/man7/ diff --git a/docs/configure.ac b/docs/configure.ac index e795bec04c..169480da6c 100644 --- a/docs/configure.ac +++ b/docs/configure.ac @@ -9,6 +9,9 @@ AC_CONFIG_FILES([ ../config/Docs.mk man/xl.cfg.5.pod man/xl.1.pod +man/xl-disk-configuration.5.pod +man/xl-network-configuration.5.pod +man/xl.conf.5.pod ]) AC_CONFIG_AUX_DIR([../]) diff --git a/docs/man/xl-disk-configuration.5.pod b/docs/man/xl-disk-configuration.5.pod.in similarity index 99% rename from docs/man/xl-disk-configuration.5.pod rename to docs/man/xl-disk-configuration.5.pod.in index 7965d5dd73..95c23b4a92 100644 --- a/docs/man/xl-disk-configuration.5.pod +++ b/docs/man/xl-disk-configuration.5.pod.in @@ -257,7 +257,7 @@ automatically determine the most suitable backend. Specifies that B is not a normal host path, but rather information to be interpreted by the executable program I