From patchwork Mon Jan 11 17:41:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olaf Hering X-Patchwork-Id: 12011339 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3A88FC433DB for ; Mon, 11 Jan 2021 17:50:57 +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 E94FA20738 for ; Mon, 11 Jan 2021 17:50:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E94FA20738 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=aepfle.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.65268.115709 (Exim 4.92) (envelope-from ) id 1kz1L6-0007jh-7K; Mon, 11 Jan 2021 17:50:48 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 65268.115709; Mon, 11 Jan 2021 17:50:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kz1L6-0007jY-3u; Mon, 11 Jan 2021 17:50:48 +0000 Received: by outflank-mailman (input) for mailman id 65268; Mon, 11 Jan 2021 17:50:47 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kz1E7-0002a6-1O for xen-devel@lists.xenproject.org; Mon, 11 Jan 2021 17:43:35 +0000 Received: from mo4-p01-ob.smtp.rzone.de (unknown [85.215.255.53]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 1c65e824-aa95-492f-a39b-6908ed7b7505; Mon, 11 Jan 2021 17:42:44 +0000 (UTC) Received: from sender by smtp.strato.de (RZmta 47.12.1 SBL|AUTH) with ESMTPSA id h0968ex0BHgRM3F (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256 bits)) (Client did not present a certificate); Mon, 11 Jan 2021 18:42:27 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 1c65e824-aa95-492f-a39b-6908ed7b7505 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1610386964; s=strato-dkim-0002; d=aepfle.de; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:From: Subject:Sender; bh=9pjTvN2SDiVoAmd9HAK4WC99qoqIwJCGptpIVjUyIgE=; b=HjX4tyGOdwTuV0w53C62CtS0mhov8/dpwOpBQbrd6ryRGy264G73vH+si/NokSWnWt aRUNUchl8K42i1bte9liqzrbKXYOta7VtAi4K81en5oqZZWhPtnQgon1qos0wnDeajJK SM3o61de4U4D4hS1Vs+o2PYbVMmGR4uUaBsEphMEhj5R8Tjjt///H9MEXsp9z/Lu/eUM oZW6+R/yqYh22oXbiUtnftS9HBAySZbSj/2wB/i94FSNuNY6VAnj++Lo/igXElxu0s6E DzwjsRGqpVjAPMa2F0SRkMvJNW8Nh3ieMwWThSgVgz9rqXAzLvOfySflr5TiyRmpYBE0 VoBw== X-RZG-AUTH: ":P2EQZWCpfu+qG7CngxMFH1J+3q8wa/QXkBR9MXjAuzBW/OdlBZQ4AHSS2W0g" X-RZG-CLASS-ID: mo00 From: Olaf Hering To: xen-devel@lists.xenproject.org Cc: Olaf Hering , Daniel De Graaf , Quan Xu , Samuel Thibault Subject: [PATCH v20210111 01/39] stubdom: fix tpm_version Date: Mon, 11 Jan 2021 18:41:46 +0100 Message-Id: <20210111174224.24714-2-olaf@aepfle.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210111174224.24714-1-olaf@aepfle.de> References: <20210111174224.24714-1-olaf@aepfle.de> MIME-Version: 1.0 It is just a declaration, not a variable. ld: /home/abuild/rpmbuild/BUILD/xen-4.14.20200616T103126.3625b04991/non-dbg/stubdom/vtpmmgr/vtpmmgr.a(vtpm_cmd_handler.o):(.bss+0x0): multiple definition of `tpm_version'; /home/abuild/rpmbuild/BUILD/xen-4.14.20200616T103126.3625b04991/non-dbg/stubdom/vtpmmgr/vtpmmgr.a(vtpmmgr.o):(.bss+0x0): first defined here Signed-off-by: Olaf Hering Reviewed-by: Samuel Thibault --- stubdom/vtpmmgr/vtpmmgr.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stubdom/vtpmmgr/vtpmmgr.h b/stubdom/vtpmmgr/vtpmmgr.h index 2e6f8de9e4..f40ca9fd67 100644 --- a/stubdom/vtpmmgr/vtpmmgr.h +++ b/stubdom/vtpmmgr/vtpmmgr.h @@ -53,7 +53,7 @@ enum { TPM1_HARDWARE = 1, TPM2_HARDWARE, -} tpm_version; +}; struct tpm_hardware_version { int hw_version; From patchwork Mon Jan 11 17:41:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olaf Hering X-Patchwork-Id: 12011247 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5DED6C43381 for ; Mon, 11 Jan 2021 17:42:57 +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 1C2B0225AB for ; Mon, 11 Jan 2021 17:42:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1C2B0225AB Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=aepfle.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.65104.115242 (Exim 4.92) (envelope-from ) id 1kz1DF-0002dA-8m; Mon, 11 Jan 2021 17:42:41 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 65104.115242; Mon, 11 Jan 2021 17:42:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kz1DF-0002d2-5I; Mon, 11 Jan 2021 17:42:41 +0000 Received: by outflank-mailman (input) for mailman id 65104; Mon, 11 Jan 2021 17:42:40 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kz1DD-0002a6-Vw for xen-devel@lists.xenproject.org; Mon, 11 Jan 2021 17:42:40 +0000 Received: from mo4-p01-ob.smtp.rzone.de (unknown [85.215.255.52]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id f9295fc2-39d0-48f8-ad78-b3ea1c733419; Mon, 11 Jan 2021 17:42:36 +0000 (UTC) Received: from sender by smtp.strato.de (RZmta 47.12.1 SBL|AUTH) with ESMTPSA id h0968ex0BHgRM3G (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256 bits)) (Client did not present a certificate); Mon, 11 Jan 2021 18:42:27 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: f9295fc2-39d0-48f8-ad78-b3ea1c733419 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1610386955; s=strato-dkim-0002; d=aepfle.de; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:From: Subject:Sender; bh=PqavFAEZ5cTdGstAdYlAd/8S+6nO+Bcr5/jInWJ/Ous=; b=AAXwHNhnQvVF9iCbwVSmN/fYPPNSKybpg4GUuXoOmDgYhelL9S4eVf7GCIVaTMSoeK BeEuMVQvqPz3iez+MWGWDeAibXl8dSkzIfST0CyBwTPHvVy+/XHMkbRiDwDqeM8NBILS lzIlCH4H3DNDcIgekHUvhVmeWJtclQeMOv06P5yT36i3D86LJnu84AaCzjc9pvyvHyVk fTCXLo25kGdvGocR8ezBk9dX8b3FDWikDhcvwzz4lSq7wL939aMvKYnlBwVI4rcgggT2 KKAs2G/Aq6X0hsoLTQ/A/XHMkzJMTZxQfiw8NS60K7rOLjm/GzxRJKvaGy0sQGYQKSGT rJjg== X-RZG-AUTH: ":P2EQZWCpfu+qG7CngxMFH1J+3q8wa/QXkBR9MXjAuzBW/OdlBZQ4AHSS2W0g" X-RZG-CLASS-ID: mo00 From: Olaf Hering To: xen-devel@lists.xenproject.org Cc: Olaf Hering , Ian Jackson , Wei Liu , Anthony PERARD Subject: [PATCH v20210111 02/39] xl: use proper name for bash_completion file Date: Mon, 11 Jan 2021 18:41:47 +0100 Message-Id: <20210111174224.24714-3-olaf@aepfle.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210111174224.24714-1-olaf@aepfle.de> References: <20210111174224.24714-1-olaf@aepfle.de> MIME-Version: 1.0 Files in the bash-completion dirs should be named like the commands, without suffix. Without this change 'xl' will not be recognized as a command with completion support if BASH_COMPLETION_DIR is set to /usr/share/bash-completion/completions. Fixes commit 9136a919b19929ecb242ef327053d55d824397df Signed-off-by: Olaf Hering --- tools/xl/Makefile | 4 ++-- tools/xl/bash-completion | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/xl/Makefile b/tools/xl/Makefile index bdf67c8464..656b21c7da 100644 --- a/tools/xl/Makefile +++ b/tools/xl/Makefile @@ -45,11 +45,11 @@ install: all $(INSTALL_DIR) $(DESTDIR)$(sbindir) $(INSTALL_DIR) $(DESTDIR)$(BASH_COMPLETION_DIR) $(INSTALL_PROG) xl $(DESTDIR)$(sbindir) - $(INSTALL_DATA) bash-completion $(DESTDIR)$(BASH_COMPLETION_DIR)/xl.sh + $(INSTALL_DATA) bash-completion $(DESTDIR)$(BASH_COMPLETION_DIR)/xl .PHONY: uninstall uninstall: - rm -f $(DESTDIR)$(BASH_COMPLETION_DIR)/xl.sh + rm -f $(DESTDIR)$(BASH_COMPLETION_DIR)/xl rm -f $(DESTDIR)$(sbindir)/xl .PHONY: clean diff --git a/tools/xl/bash-completion b/tools/xl/bash-completion index b7cd6b3992..7c6ed32f88 100644 --- a/tools/xl/bash-completion +++ b/tools/xl/bash-completion @@ -1,4 +1,4 @@ -# Copy this file to /etc/bash_completion.d/xl.sh +# Copy this file to /etc/bash_completion.d/xl _xl() { From patchwork Mon Jan 11 17:41:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olaf Hering X-Patchwork-Id: 12011249 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 733F7C433E6 for ; Mon, 11 Jan 2021 17:42:58 +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 2B99420738 for ; Mon, 11 Jan 2021 17:42:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2B99420738 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=aepfle.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.65102.115218 (Exim 4.92) (envelope-from ) id 1kz1DA-0002aN-Nc; Mon, 11 Jan 2021 17:42:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 65102.115218; Mon, 11 Jan 2021 17:42:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kz1DA-0002aG-KY; Mon, 11 Jan 2021 17:42:36 +0000 Received: by outflank-mailman (input) for mailman id 65102; Mon, 11 Jan 2021 17:42:35 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kz1D9-0002a6-1B for xen-devel@lists.xenproject.org; Mon, 11 Jan 2021 17:42:35 +0000 Received: from mo4-p01-ob.smtp.rzone.de (unknown [81.169.146.164]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 2367c118-b084-4797-933d-c71a713d7d1b; Mon, 11 Jan 2021 17:42:34 +0000 (UTC) Received: from sender by smtp.strato.de (RZmta 47.12.1 SBL|AUTH) with ESMTPSA id h0968ex0BHgSM3H (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256 bits)) (Client did not present a certificate); Mon, 11 Jan 2021 18:42:28 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 2367c118-b084-4797-933d-c71a713d7d1b DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1610386953; s=strato-dkim-0002; d=aepfle.de; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:From: Subject:Sender; bh=K200fMdhQvOaSArgwIO6LGZZROIpb6XT6yWd/g5GUvE=; b=W7ZlDbpVhUIld+tfoDtqnNZKRbG7Zh/fHfkMR61JuJ4oalLQozdu1Zj3IveAosKnEz NTvvG4ZCD+kCppJEDJudwMJnkyRbIKpBuPgUXemE01/izRTYiwGS6YPS+D09iQvaHaF7 WtXjkzxBHpup8zP4jB1vhJjQHychI8nudxhjCL6RyolTJrqN20pwdGNuBoJCeeCqRKi/ UK+h41jtGgl728BskYYSKv41an0U9jJgxgLUeQa1IPGsz9ADM76X9hI0KH7VkVqsrzmv wcVvV92YsY4OS0hhEo28K6ziqhMtIlxtU8ZapWuZx/mFzIKbrxbx+abYvBlvF7QpNR1G Kznw== X-RZG-AUTH: ":P2EQZWCpfu+qG7CngxMFH1J+3q8wa/QXkBR9MXjAuzBW/OdlBZQ4AHSS2W0g" X-RZG-CLASS-ID: mo00 From: Olaf Hering To: xen-devel@lists.xenproject.org Cc: Olaf Hering , Ian Jackson , Wei Liu Subject: [PATCH v20210111 03/39] docs: remove stale create example from xl.1 Date: Mon, 11 Jan 2021 18:41:48 +0100 Message-Id: <20210111174224.24714-4-olaf@aepfle.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210111174224.24714-1-olaf@aepfle.de> References: <20210111174224.24714-1-olaf@aepfle.de> MIME-Version: 1.0 Maybe xm create had a feature to create a domU based on a configuration file. xl create requires the '-f' option to refer to a file. There is no code to look into XEN_CONFIG_DIR, so remove the example. Signed-off-by: Olaf Hering Reviewed-by: Ian Jackson --- docs/man/xl.1.pod.in | 7 ------- 1 file changed, 7 deletions(-) diff --git a/docs/man/xl.1.pod.in b/docs/man/xl.1.pod.in index af31d2b572..c7b2fcc927 100644 --- a/docs/man/xl.1.pod.in +++ b/docs/man/xl.1.pod.in @@ -171,13 +171,6 @@ B =over 4 -=item I - - xl create DebianLenny - -This creates a domain with the file /etc/xen/DebianLenny, and returns as -soon as it is run. - =item I xl create hvm.cfg 'cpus="0-3"; pci=["01:05.1","01:05.2"]' From patchwork Mon Jan 11 17:41:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olaf Hering X-Patchwork-Id: 12011245 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 802B0C4332B for ; Mon, 11 Jan 2021 17:42:57 +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 3580422AAF for ; Mon, 11 Jan 2021 17:42:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3580422AAF Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=aepfle.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.65106.115266 (Exim 4.92) (envelope-from ) id 1kz1DJ-0002iB-Rq; Mon, 11 Jan 2021 17:42:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 65106.115266; Mon, 11 Jan 2021 17:42:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kz1DJ-0002i4-OH; Mon, 11 Jan 2021 17:42:45 +0000 Received: by outflank-mailman (input) for mailman id 65106; Mon, 11 Jan 2021 17:42:45 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kz1DI-0002a6-Vz for xen-devel@lists.xenproject.org; Mon, 11 Jan 2021 17:42:45 +0000 Received: from mo4-p02-ob.smtp.rzone.de (unknown [85.215.255.81]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 42e1ab8f-a3ed-410c-8bef-42c6a6e81da8; Mon, 11 Jan 2021 17:42:36 +0000 (UTC) Received: from sender by smtp.strato.de (RZmta 47.12.1 SBL|AUTH) with ESMTPSA id h0968ex0BHgTM3I (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256 bits)) (Client did not present a certificate); Mon, 11 Jan 2021 18:42:29 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 42e1ab8f-a3ed-410c-8bef-42c6a6e81da8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1610386955; s=strato-dkim-0002; d=aepfle.de; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:From: Subject:Sender; bh=QiPerdOU9xygk7E7MXkq1VASHZU9W0Hszj+BzxbqjQo=; b=A2uds57lki+sBKIERoJZ5uOmdj5dKjFGtI7lXHGcYdAWF0oli6yuz+m+bJTjF7Rs8Y PcfSMc46w6/4geQCrKF2kFPQIn/XtvCZirKHoamr4BaR8RuakEholQbczxgsPSF8CR1u zKA42t4ZraVAS3AzWdKzu6rrk2+TBmIuSXKSJqfgdD1yT2zZ4fppw/LDgxVxyPs52s+M zxTv/YreOEaFjOgK6fvsMtpMZ/jq3F1faA22uqKOaYIGIh1gQPssXeqKYviynkW24ZtR DyyVteCo+TJRwyW8+0CH65lrbICqvwZX6igydKq9Oi7pfEIcuAsftXgzjR9ZWrUyYvGG qWuA== X-RZG-AUTH: ":P2EQZWCpfu+qG7CngxMFH1J+3q8wa/QXkBR9MXjAuzBW/OdlBZQ4AHSS2W0g" X-RZG-CLASS-ID: mo00 From: Olaf Hering To: xen-devel@lists.xenproject.org Cc: Olaf Hering , Anthony PERARD , Ian Jackson , Wei Liu Subject: [PATCH v20210111 04/39] docs: substitute XEN_CONFIG_DIR in xl.conf.5 Date: Mon, 11 Jan 2021 18:41:49 +0100 Message-Id: <20210111174224.24714-5-olaf@aepfle.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210111174224.24714-1-olaf@aepfle.de> References: <20210111174224.24714-1-olaf@aepfle.de> MIME-Version: 1.0 xl(1) opens xl.conf in XEN_CONFIG_DIR. Substitute this variable also in the man page. Signed-off-by: Olaf Hering Reviewed-by: Anthony PERARD --- docs/man/xl.1.pod.in | 2 +- docs/man/xl.conf.5.pod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/man/xl.1.pod.in b/docs/man/xl.1.pod.in index c7b2fcc927..765c169ed2 100644 --- a/docs/man/xl.1.pod.in +++ b/docs/man/xl.1.pod.in @@ -50,7 +50,7 @@ setup the bridge. If you specify the amount of memory dom0 has, passing B to Xen, it is highly recommended to disable B. Edit -B and set it to 0. +B<@XEN_CONFIG_DIR@/xl.conf> and set it to 0. =item run xl as B diff --git a/docs/man/xl.conf.5.pod b/docs/man/xl.conf.5.pod index 41ee428744..dfea9d64ba 100644 --- a/docs/man/xl.conf.5.pod +++ b/docs/man/xl.conf.5.pod @@ -1,6 +1,6 @@ =head1 NAME -/etc/xen/xl.conf - XL Global/Host Configuration +@XEN_CONFIG_DIR@/xl.conf - XL Global/Host Configuration =head1 DESCRIPTION From patchwork Mon Jan 11 17:41:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olaf Hering X-Patchwork-Id: 12011241 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 18C9DC433DB for ; Mon, 11 Jan 2021 17:42:56 +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 9D5E3225AB for ; Mon, 11 Jan 2021 17:42:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9D5E3225AB Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=aepfle.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.65103.115222 (Exim 4.92) (envelope-from ) id 1kz1DB-0002ao-0I; Mon, 11 Jan 2021 17:42:37 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 65103.115222; Mon, 11 Jan 2021 17:42:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kz1DA-0002ag-S9; Mon, 11 Jan 2021 17:42:36 +0000 Received: by outflank-mailman (input) for mailman id 65103; Mon, 11 Jan 2021 17:42:35 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kz1D9-0002aB-Sx for xen-devel@lists.xenproject.org; Mon, 11 Jan 2021 17:42:35 +0000 Received: from mo4-p02-ob.smtp.rzone.de (unknown [85.215.255.84]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id a3f9a1dc-bf43-402b-a2c2-b8ffc9fd3c48; Mon, 11 Jan 2021 17:42:34 +0000 (UTC) Received: from sender by smtp.strato.de (RZmta 47.12.1 SBL|AUTH) with ESMTPSA id h0968ex0BHgTM3K (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256 bits)) (Client did not present a certificate); Mon, 11 Jan 2021 18:42:29 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: a3f9a1dc-bf43-402b-a2c2-b8ffc9fd3c48 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1610386953; s=strato-dkim-0002; d=aepfle.de; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:From: Subject:Sender; bh=4DYp51Vc9ztkdEHMvY1HqDsmG8RHkVlIlHFvANw7/Sw=; b=W63+KYv3fQgdRWGN1Q9R3yNRpAuAEVQSsDY2B4EaVIcOZQCKBJYZSlddepDiFtE1Vg Rcwqh1xE+8W92jZMfjBB5d0l5EAKB2xqKdG+ZO7zDgm7hoxRCA+n1mtei0Mgla53OYzQ WjKE3dumX4Mx32UKuvmYQoQYu10jfyG3CByLO/tX/+T+yGYyB6etMxOwU4CGDnd5/m2U 3/xqJQiqV3noCdJFU65tw3WqttRVDs49kcKFD5zT6+hW3HxGb67d8GmMdRpfJCqrm4jX qvt3vuipg3kgOs1+1BizoTVxa0mTQo0dBhpGLT/NvqV0+lCxK/abs/r0Lhd/vcjKUupN Mw1Q== X-RZG-AUTH: ":P2EQZWCpfu+qG7CngxMFH1J+3q8wa/QXkBR9MXjAuzBW/OdlBZQ4AHSS2W0g" X-RZG-CLASS-ID: mo00 From: Olaf Hering To: xen-devel@lists.xenproject.org Cc: Olaf Hering , Ian Jackson , Wei Liu Subject: [PATCH v20210111 05/39] tools: add with-xen-scriptdir configure option Date: Mon, 11 Jan 2021 18:41:50 +0100 Message-Id: <20210111174224.24714-6-olaf@aepfle.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210111174224.24714-1-olaf@aepfle.de> References: <20210111174224.24714-1-olaf@aepfle.de> MIME-Version: 1.0 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 Mon Jan 11 17:41:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olaf Hering X-Patchwork-Id: 12011323 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 76038C433E0 for ; Mon, 11 Jan 2021 17:50:23 +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 435A5223E0 for ; Mon, 11 Jan 2021 17:50:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 435A5223E0 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=aepfle.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.65226.115602 (Exim 4.92) (envelope-from ) id 1kz1KX-0006mX-7d; Mon, 11 Jan 2021 17:50:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 65226.115602; Mon, 11 Jan 2021 17:50:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kz1KX-0006mO-3H; Mon, 11 Jan 2021 17:50:13 +0000 Received: by outflank-mailman (input) for mailman id 65226; Mon, 11 Jan 2021 17:50:11 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kz1El-0002a6-2L for xen-devel@lists.xenproject.org; Mon, 11 Jan 2021 17:44:15 +0000 Received: from mo4-p02-ob.smtp.rzone.de (unknown [85.215.255.81]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id f70bf9f9-9d01-4a63-8e9f-ede50b08e041; Mon, 11 Jan 2021 17:42:44 +0000 (UTC) Received: from sender by smtp.strato.de (RZmta 47.12.1 SBL|AUTH) with ESMTPSA id h0968ex0BHgTM3L (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256 bits)) (Client did not present a certificate); Mon, 11 Jan 2021 18:42:29 +0100 (CET) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: f70bf9f9-9d01-4a63-8e9f-ede50b08e041 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1610386963; s=strato-dkim-0002; d=aepfle.de; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:From: Subject:Sender; bh=ti8CP/B9G6c5O+6wVpkEtLXEkgdKGjEhZREHyWZEFow=; b=GJjK49Yxqzkp6Pa1bPTpZFKFPvIUhTkTLoiBosEA+KkR77qS9jgqS6CLIBakywferL piGWxY4ughtnGl3Cxf9UTmpkoj2sRywPTynxx04NilIyukGNgvL0s43zi/V+BbXnh1Xp B4CAEsv8AiACDk98ZxbtVft716+avmcB09bELpqrUuHoA7bferUxlibQqLW/nA+4m3P/ wIIeQy61dYJ9/EAVgpiS7t39a5XbX6JnHFSu9AuJ0F+R1nAY4K+E4tb+N8xEMURhLe/j RH6mSgPeelAdExsj7zf5z4JS6JTYu+vvnm8NiUA1i3ZFpr899rjsRAjqdON4rdPlV7Rq BjSg== X-RZG-AUTH: ":P2EQZWCpfu+qG7CngxMFH1J+3q8wa/QXkBR9MXjAuzBW/OdlBZQ4AHSS2W0g" X-RZG-CLASS-ID: mo00 From: Olaf Hering To: xen-devel@lists.xenproject.org Cc: Olaf Hering , Andrew Cooper , George Dunlap , Ian Jackson , Jan Beulich , Julien Grall , Stefano Stabellini , Wei Liu , Anthony PERARD Subject: [PATCH v20210111 06/39] Use XEN_SCRIPT_DIR to refer to /etc/xen/scripts Date: Mon, 11 Jan 2021 18:41:51 +0100 Message-Id: <20210111174224.24714-7-olaf@aepfle.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210111174224.24714-1-olaf@aepfle.de> References: <20210111174224.24714-1-olaf@aepfle.de> MIME-Version: 1.0 Replace all hardcoded paths to use XEN_SCRIPT_DIR to expand the actual location. Update .gitignore. Signed-off-by: Olaf Hering Reviewed-by: Ian Jackson --- .gitignore | 3 +++ docs/configure.ac | 3 +++ ...k-configuration.5.pod => xl-disk-configuration.5.pod.in} | 2 +- ...onfiguration.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 b169d78ed7..76c13f3189 100644 --- a/.gitignore +++ b/.gitignore @@ -48,7 +48,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 cb5a6eaa4c..c2e5edd3b3 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 46feedb95e..71d0e86e3d 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