From patchwork Tue Sep 24 14:03:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olaf Hering X-Patchwork-Id: 11158947 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 B424C1747 for ; Tue, 24 Sep 2019 14:06:25 +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 8F50C2064A for ; Tue, 24 Sep 2019 14:06:25 +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="n0Nw8V/v" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8F50C2064A 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 1iClQk-00051H-LK; Tue, 24 Sep 2019 14:04:38 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iClQj-00050d-2z for xen-devel@lists.xenproject.org; Tue, 24 Sep 2019 14:04:37 +0000 X-Inumbo-ID: 3d7b3fbe-ded4-11e9-97fb-bc764e2007e4 Received: from mo6-p00-ob.smtp.rzone.de (unknown [2a01:238:20a:202:5300::2]) by localhost (Halon) with ESMTPS id 3d7b3fbe-ded4-11e9-97fb-bc764e2007e4; Tue, 24 Sep 2019 14:04:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1569333875; 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=T9s9NtO9OB4r/h4Xfn5sQa8tUjL463W0NB1znGOmaEY=; b=n0Nw8V/vx72KoKlacDSRQpf+AkOvodMs5Z0N0tvqhIleIPe5w7HHbpsphQ9dtWLNPC frDkAaHnCoivs3zBTI4oP4g8gqqs0RQYA2XynrSELVf2VeDZ+fUH6mBPxV3Dq29QKARY WT+M5CYEW0P9rbjja4YQbkv9qUxZ7LcabF52JykFGvHtamKTUX54Qvz07gw3CkbocDqQ b+l/ejdQNXWCRcUuMCR5nTYytfXBJheAlirxZon0h6Wll5+SlEjq/pivc+nOmFFc4e9J eV5BkQTQNPZ1MRMNND7MM2bCV2yJFZRQ4uy5m2/Dkr8DYZqsEstXGjiFSuHrpY7a8XQg dmlg== X-RZG-AUTH: ":P2EQZWCpfu+qG7CngxMFH1J+3q8wa/QXkBR9MXjAuz7MdiQehTvc3KJf+j/F" X-RZG-CLASS-ID: mo00 Received: from sender by smtp.strato.de (RZmta 44.28.0 SBL|AUTH) with ESMTPSA id j06a90v8OE3O1mh (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); Tue, 24 Sep 2019 16:03:24 +0200 (CEST) From: Olaf Hering To: xen-devel@lists.xenproject.org Date: Tue, 24 Sep 2019 16:03:12 +0200 Message-Id: <20190924140319.11303-2-olaf@aepfle.de> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20190924140319.11303-1-olaf@aepfle.de> References: <20190924140319.11303-1-olaf@aepfle.de> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH RESEND v1 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 Acked-by: Daniel De Graaf --- 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 Tue Sep 24 14:03:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olaf Hering X-Patchwork-Id: 11158931 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 0EC44112B for ; Tue, 24 Sep 2019 14:05:04 +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 DDE232168B for ; Tue, 24 Sep 2019 14:05:03 +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="PM0HL26b" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DDE232168B 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 1iClPj-0004cm-W1; Tue, 24 Sep 2019 14:03:35 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iClPi-0004cb-SV for xen-devel@lists.xenproject.org; Tue, 24 Sep 2019 14:03:34 +0000 X-Inumbo-ID: 18100ed0-ded4-11e9-97fb-bc764e2007e4 Received: from mo6-p01-ob.smtp.rzone.de (unknown [2a01:238:20a:202:5301::5]) by localhost (Halon) with ESMTPS id 18100ed0-ded4-11e9-97fb-bc764e2007e4; Tue, 24 Sep 2019 14:03:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1569333812; 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=0hVHlozr9dEC+CBD27LsgyQXc0TkCiGvixA/+21xxZQ=; b=PM0HL26bjezL8rVw2l6dHkgpuNf71FkRB+dRx2PqWIFiK4QUwb9MjJU5ztYU30pjrP nxPPkvoUh72mYXW3q4GJpxQZu94KXOYfm6BNpcYVqaUDC5fZG79nBrFMTIyH0kOliBzh czHIuf9oTy7lszGLxIZZaAvbdlU9emyg3NsCKKUHzAaoIxkBhDF08imi2lwiDaplfxCH iBvh70APozCg/dT2YlFf7ZZrWHX1sXEU/Q9fghRJ1xz2og0DkVrATJkZlf9lGYX8j7L7 EBHEmbbx0KcosylK80EV/8kOUVbCTqgiwTFfZjts77j4E0PTgpmpU1zQYz9FGnCnB8BT WIgA== X-RZG-AUTH: ":P2EQZWCpfu+qG7CngxMFH1J+3q8wa/QXkBR9MXjAuz7MdiQehTvc3KJf+j/F" X-RZG-CLASS-ID: mo00 Received: from sender by smtp.strato.de (RZmta 44.28.0 SBL|AUTH) with ESMTPSA id j06a90v8OE3Q1mi (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); Tue, 24 Sep 2019 16:03:26 +0200 (CEST) From: Olaf Hering To: xen-devel@lists.xenproject.org Date: Tue, 24 Sep 2019 16:03:13 +0200 Message-Id: <20190924140319.11303-3-olaf@aepfle.de> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20190924140319.11303-1-olaf@aepfle.de> References: <20190924140319.11303-1-olaf@aepfle.de> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH RESEND v1 2/8] tools: move scripts from etc to libexec 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, move the hotplug scripts to libexec because they are not exactly configuration. Signed-off-by: Olaf Hering --- m4/paths.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/paths.m4 b/m4/paths.m4 index 89d3bb8312..0ccc92d0ff 100644 --- a/m4/paths.m4 +++ b/m4/paths.m4 @@ -137,7 +137,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=${LIBEXEC}/scripts AC_SUBST(XEN_SCRIPT_DIR) case "$host_os" in From patchwork Tue Sep 24 14:03:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olaf Hering X-Patchwork-Id: 11158937 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 9C96E112B for ; Tue, 24 Sep 2019 14:05:31 +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 783A92064A for ; Tue, 24 Sep 2019 14:05:31 +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="KrDtdRg0" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 783A92064A 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 1iClQF-0004ot-59; Tue, 24 Sep 2019 14:04:07 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iClQD-0004oS-Vn for xen-devel@lists.xenproject.org; Tue, 24 Sep 2019 14:04:05 +0000 X-Inumbo-ID: 25e97d98-ded4-11e9-bf31-bc764e2007e4 Received: from mo6-p01-ob.smtp.rzone.de (unknown [2a01:238:20a:202:5301::6]) by localhost (Halon) with ESMTPS id 25e97d98-ded4-11e9-bf31-bc764e2007e4; Tue, 24 Sep 2019 14:03:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1569333836; 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=jEOmbRny/ROk4euw9gy63jwyv17DX2u/l8o9dBTV3JA=; b=KrDtdRg0oZcaieFHjT8yg0V+AbfAyryE57SMTOmdPzD82+8D00Q84Zv5e6ICH6LZlQ vJbn4ByuQwsvMDU0FVGWbIStX55NuDkI6faMSy9h9ciAf9+W1vsLYSEQNLEFRJ+5phL3 TR4rxHtGkSWxks2aKH7wq/KXIGF4G///y6hQtUpt1ekblRIVwJLvx3mljCY9+eKCXscc wfufrqveEHiIRhYvxVXbKb7GGkL2yBekK6FCrwaaT+zz8lhKF3G26DdMXxofDtVe4gw8 XHdUk5m3MPjwfIEKtB/Edh4l9tOP39cKO/oAHLG0sXDBpp2UzpX2qVg92x2SKuE8y2Z8 ut4g== X-RZG-AUTH: ":P2EQZWCpfu+qG7CngxMFH1J+3q8wa/QXkBR9MXjAuz7MdiQehTvc3KJf+j/F" X-RZG-CLASS-ID: mo00 Received: from sender by smtp.strato.de (RZmta 44.28.0 SBL|AUTH) with ESMTPSA id j06a90v8OE3S1mj (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); Tue, 24 Sep 2019 16:03:28 +0200 (CEST) From: Olaf Hering To: xen-devel@lists.xenproject.org Date: Tue, 24 Sep 2019 16:03:14 +0200 Message-Id: <20190924140319.11303-4-olaf@aepfle.de> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20190924140319.11303-1-olaf@aepfle.de> References: <20190924140319.11303-1-olaf@aepfle.de> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH RESEND v1 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 , Wei Liu , Konrad Rzeszutek Wilk , George Dunlap , Andrew Cooper , Ian Jackson , Tim Deegan , Julien Grall , Jan Beulich Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Now that scripts are stored in libexec, 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