From patchwork Fri Jan 22 15:55:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 12039857 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 586FFC4332B for ; Fri, 22 Jan 2021 15:56:28 +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 1D56E233FC for ; Fri, 22 Jan 2021 15:56:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1D56E233FC Authentication-Results: mail.kernel.org; dmarc=pass (p=none dis=none) header.from=xenproject.org 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.72897.131381 (Exim 4.92) (envelope-from ) id 1l2ynF-0004bV-Te; Fri, 22 Jan 2021 15:56:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72897.131381; Fri, 22 Jan 2021 15:56: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 1l2ynF-0004bO-QQ; Fri, 22 Jan 2021 15:56:13 +0000 Received: by outflank-mailman (input) for mailman id 72897; Fri, 22 Jan 2021 15:56:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2ynE-0004at-HF for xen-devel@lists.xenproject.org; Fri, 22 Jan 2021 15:56:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2ynE-0002OJ-DH for xen-devel@lists.xenproject.org; Fri, 22 Jan 2021 15:56:12 +0000 Received: from iwj (helo=mariner.uk.xensource.com) by xenbits.xenproject.org with local-bsmtp (Exim 4.92) (envelope-from ) id 1l2ynE-0000R1-CF for xen-devel@lists.xenproject.org; Fri, 22 Jan 2021 15:56:12 +0000 Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by mariner.uk.xensource.com with esmtp (Exim 4.89) (envelope-from ) id 1l2ynC-0004Ar-FM; Fri, 22 Jan 2021 15:56:10 +0000 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" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version: Message-Id:Date:Subject:Cc:To:From; bh=uruu1brBPF9CVtq5ECLiA2WZSJ/C5nDctUOD+ZVBmXU=; b=Duuglm/o8nqen2vKVN1Ni6L2aU wEW0ekrTR/+HNo26L0mLodfx3ucdIJAc3NhDZib25DBFG0rbKS0uf2hmRNV9IravzSO8yca7Eg7Wz F9Ch+jxTL+T5uXcB3Ri4KwLZNoEXkTbPX6phA/gmarx/W1PmpZ3rbs+Wt35sl69E5qHQ=; From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson Subject: [OSSTEST PATCH 1/7] target_editfile_kvp_replace: Support changing multiple keys Date: Fri, 22 Jan 2021 15:55:57 +0000 Message-Id: <20210122155603.23402-1-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 No functional change with existing callers. Signed-off-by: Ian Jackson --- Osstest/TestSupport.pm | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index 9362a865..d2558f31 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -769,25 +769,32 @@ sub teditfileex { if $install; } -# Replace a Key=Value style line in a config file. +# Replace Key=Value style line(s) in a config file. # # To be used as 3rd argument to target_editfile(_root) as: # target_editfile_root($ho, "/path/to/a/file", # sub { target_editfile_kvp_replace($key, $value) }); -sub target_editfile_kvp_replace ($$) +sub target_editfile_kvp_replace { - my ($key,$value) = @_; - my $prnow; - $prnow= sub { + my (%kv) = @_; + my $prnow= sub { + my ($key) = @_; + my $value = $kv{$key}; + return unless defined $value; print ::EO "$key=$value\n" or die $!; - $prnow= sub { }; + delete $kv{$key}; }; while (<::EI>) { - print ::EO or die $! unless m/^$key\b/; - $prnow->() if m/^#$key/; + if (m/^\S+\b/ && exists $kv{$&}) { + $prnow->($&); + } else { + print ::EO or die $!; + } } print ::EO "\n" or die $!; - $prnow->(); + foreach my $key (sort keys %kv) { + $prnow->($key); + } }; sub target_editfile_root ($$$;$$) { teditfileex('root',@_); } From patchwork Fri Jan 22 15:55:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 12039847 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 1B6CEC433E6 for ; Fri, 22 Jan 2021 15:56:27 +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 C1F6F22248 for ; Fri, 22 Jan 2021 15:56:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C1F6F22248 Authentication-Results: mail.kernel.org; dmarc=pass (p=none dis=none) header.from=xenproject.org 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.72898.131389 (Exim 4.92) (envelope-from ) id 1l2ynG-0004bz-DV; Fri, 22 Jan 2021 15:56:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72898.131389; Fri, 22 Jan 2021 15:56:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2ynG-0004bm-2V; Fri, 22 Jan 2021 15:56:14 +0000 Received: by outflank-mailman (input) for mailman id 72898; Fri, 22 Jan 2021 15:56:12 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2ynE-0004ay-MY for xen-devel@lists.xenproject.org; Fri, 22 Jan 2021 15:56:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2ynE-0002OM-Lf for xen-devel@lists.xenproject.org; Fri, 22 Jan 2021 15:56:12 +0000 Received: from iwj (helo=mariner.uk.xensource.com) by xenbits.xenproject.org with local-bsmtp (Exim 4.92) (envelope-from ) id 1l2ynE-0000RF-KM for xen-devel@lists.xenproject.org; Fri, 22 Jan 2021 15:56:12 +0000 Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by mariner.uk.xensource.com with esmtp (Exim 4.89) (envelope-from ) id 1l2ynC-0004Ar-Mt; Fri, 22 Jan 2021 15:56:11 +0000 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" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=V4DNzO9T0hlpsDh/QQtSucpoSUBfF4hGCHEzohAvxvY=; b=RxNME30Y6jHmgfZsZYe3qAyQAg cjeokpkgi7Hnilre8GiGPBEW6kxA0OlgU+vhgBRPBqS4Hzbgeh7eMCCaB/EOVlwUepQVAGMZlPXC6 x9E0km2tjqN6PxtvA+PYEuUZMUgL2AF99ejAaFd18HZIVB64hocBs3f/W2GunEELH0g8=; From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson Subject: [OSSTEST PATCH 2/7] target_editfile_kvp_replace: Add a bit of logging Date: Fri, 22 Jan 2021 15:55:58 +0000 Message-Id: <20210122155603.23402-2-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210122155603.23402-1-iwj@xenproject.org> References: <20210122155603.23402-1-iwj@xenproject.org> MIME-Version: 1.0 This helps see what's going on without fishing individual before-and-after files out of the log directory. Signed-off-by: Ian Jackson --- Osstest/TestSupport.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index d2558f31..9e85303a 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -777,6 +777,7 @@ sub teditfileex { sub target_editfile_kvp_replace { my (%kv) = @_; + logm("substituing: @_"); my $prnow= sub { my ($key) = @_; my $value = $kv{$key}; From patchwork Fri Jan 22 15:55:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 12039849 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 3553EC43381 for ; Fri, 22 Jan 2021 15:56:28 +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 E8FC022248 for ; Fri, 22 Jan 2021 15:56:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E8FC022248 Authentication-Results: mail.kernel.org; dmarc=pass (p=none dis=none) header.from=xenproject.org 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.72899.131398 (Exim 4.92) (envelope-from ) id 1l2ynG-0004ck-OV; Fri, 22 Jan 2021 15:56:14 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72899.131398; Fri, 22 Jan 2021 15:56:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2ynG-0004cS-FV; Fri, 22 Jan 2021 15:56:14 +0000 Received: by outflank-mailman (input) for mailman id 72899; Fri, 22 Jan 2021 15:56:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2ynE-0004b3-VA for xen-devel@lists.xenproject.org; Fri, 22 Jan 2021 15:56:12 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2ynE-0002OP-UO for xen-devel@lists.xenproject.org; Fri, 22 Jan 2021 15:56:12 +0000 Received: from iwj (helo=mariner.uk.xensource.com) by xenbits.xenproject.org with local-bsmtp (Exim 4.92) (envelope-from ) id 1l2ynE-0000RT-SX for xen-devel@lists.xenproject.org; Fri, 22 Jan 2021 15:56:12 +0000 Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by mariner.uk.xensource.com with esmtp (Exim 4.89) (envelope-from ) id 1l2ynD-0004Ar-5W; Fri, 22 Jan 2021 15:56:11 +0000 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" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=GOOGnmdC7TmDzuok1J8HYpZTYLuCXs1wW2s99KsC2o0=; b=vGLpEwIan930QL9r1fU+09arom P3LSIqX1WHN4/3GPDetIo8Zac/Fk0AnDu4RUS94sumU/jjshPfozq1U54Et1+miPzvS/fyfp61dqy 15h5zy6wKLacmOdSH/DIBPRL4l9MR7D72lxAFaiPVZSXt12+CxaQcZc8rDBSl3doPBy8=; From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson Subject: [OSSTEST PATCH 3/7] ts-xen-install: Rename $commons_config_file Date: Fri, 22 Jan 2021 15:55:59 +0000 Message-Id: <20210122155603.23402-3-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210122155603.23402-1-iwj@xenproject.org> References: <20210122155603.23402-1-iwj@xenproject.org> MIME-Version: 1.0 This is the shell script config for xencommons. We are going to set other things here too. No functional change. Signed-off-by: Ian Jackson --- ts-xen-install | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ts-xen-install b/ts-xen-install index 5d4f8b0d..feb98951 100755 --- a/ts-xen-install +++ b/ts-xen-install @@ -127,18 +127,18 @@ sub adjustconfig () { print EO $extra or die $!; }) if toolstack($ho)->{Name} eq "xend"; - my $trace_config_file; + my $commons_config_file; foreach my $try (qw(/etc/default/xencommons /etc/sysconfig/xencommons /etc/default/xend /etc/sysconfig/xend)) { next unless target_file_exists($ho, $try); - $trace_config_file= $try; + $commons_config_file= $try; last; } - die unless defined $trace_config_file; + die unless defined $commons_config_file; - target_editfile_root($ho, $trace_config_file, + target_editfile_root($ho, $commons_config_file, sub { target_editfile_kvp_replace("XENCONSOLED_TRACE", "guest") }); target_editfile_root($ho, '/etc/libvirt/libvirtd.conf', From patchwork Fri Jan 22 15:56:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 12039853 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 3D80FC433E0 for ; Fri, 22 Jan 2021 15:56:28 +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 0029422D50 for ; Fri, 22 Jan 2021 15:56:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0029422D50 Authentication-Results: mail.kernel.org; dmarc=pass (p=none dis=none) header.from=xenproject.org 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.72900.131407 (Exim 4.92) (envelope-from ) id 1l2ynH-0004dT-6j; Fri, 22 Jan 2021 15:56:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72900.131407; Fri, 22 Jan 2021 15:56:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2ynG-0004d9-Pr; Fri, 22 Jan 2021 15:56:14 +0000 Received: by outflank-mailman (input) for mailman id 72900; Fri, 22 Jan 2021 15:56:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2ynF-0004b8-7N for xen-devel@lists.xenproject.org; Fri, 22 Jan 2021 15:56:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2ynF-0002OS-62 for xen-devel@lists.xenproject.org; Fri, 22 Jan 2021 15:56:13 +0000 Received: from iwj (helo=mariner.uk.xensource.com) by xenbits.xenproject.org with local-bsmtp (Exim 4.92) (envelope-from ) id 1l2ynF-0000Rf-3k for xen-devel@lists.xenproject.org; Fri, 22 Jan 2021 15:56:13 +0000 Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by mariner.uk.xensource.com with esmtp (Exim 4.89) (envelope-from ) id 1l2ynD-0004Ar-Co; Fri, 22 Jan 2021 15:56:11 +0000 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" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=CsoLIf8Kq8xCnyj6QmPhtuHVnLJJVZJvJ7WQ8VV1uXw=; b=BbJyOtDW18fafmJkwJ/M6KK7e0 lKRhW6T21dh/FHPx37yr6ELMfH/+rDS7xY9JrwzXqNZJgEKhZlQNDBRkOVcFgIRVM/lsc1bBC3Vaj jufTiwtxzcfmTNIejGIDkcG9GemU/OPz9KuUOmxDLXJB8J68W1DwxBP97SG4G7IKE+ew=; From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson Subject: [OSSTEST PATCH 4/7] ts-xen-install: Break out @commons_config Date: Fri, 22 Jan 2021 15:56:00 +0000 Message-Id: <20210122155603.23402-4-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210122155603.23402-1-iwj@xenproject.org> References: <20210122155603.23402-1-iwj@xenproject.org> MIME-Version: 1.0 We are going to set other things here too. Prepare for that. No functional change. Signed-off-by: Ian Jackson --- ts-xen-install | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ts-xen-install b/ts-xen-install index feb98951..fc4bf423 100755 --- a/ts-xen-install +++ b/ts-xen-install @@ -138,8 +138,12 @@ sub adjustconfig () { } die unless defined $commons_config_file; + my @commons_config = + ( + "XENCONSOLED_TRACE" => "guest", + ); target_editfile_root($ho, $commons_config_file, - sub { target_editfile_kvp_replace("XENCONSOLED_TRACE", "guest") }); + sub { target_editfile_kvp_replace(@commons_config) }); target_editfile_root($ho, '/etc/libvirt/libvirtd.conf', sub { target_editfile_kvp_replace("log_level", "1") }) From patchwork Fri Jan 22 15:56:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 12039855 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 63003C4332E for ; Fri, 22 Jan 2021 15:56:28 +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 292302343E for ; Fri, 22 Jan 2021 15:56:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 292302343E Authentication-Results: mail.kernel.org; dmarc=pass (p=none dis=none) header.from=xenproject.org 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.72901.131417 (Exim 4.92) (envelope-from ) id 1l2ynH-0004eB-IU; Fri, 22 Jan 2021 15:56:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72901.131417; Fri, 22 Jan 2021 15:56:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2ynH-0004dp-5b; Fri, 22 Jan 2021 15:56:15 +0000 Received: by outflank-mailman (input) for mailman id 72901; Fri, 22 Jan 2021 15:56:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2ynF-0004bE-DI for xen-devel@lists.xenproject.org; Fri, 22 Jan 2021 15:56:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2ynF-0002OV-Bi for xen-devel@lists.xenproject.org; Fri, 22 Jan 2021 15:56:13 +0000 Received: from iwj (helo=mariner.uk.xensource.com) by xenbits.xenproject.org with local-bsmtp (Exim 4.92) (envelope-from ) id 1l2ynF-0000Rr-Ai for xen-devel@lists.xenproject.org; Fri, 22 Jan 2021 15:56:13 +0000 Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by mariner.uk.xensource.com with esmtp (Exim 4.89) (envelope-from ) id 1l2ynD-0004Ar-Lf; Fri, 22 Jan 2021 15:56:11 +0000 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" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=LXz2SBk/tge0HrEhZ4XkureLZrztgn20+8xs7mXTcOo=; b=5SdFw+NmNwDqyrwk0WHsEfwEOC /we6ebyivbGdXtob6RxEI3helLxkswRcWjq1UH41lVvkeVkOV6N/d4wDltgRppIgvHd8gVxdr1a0k S7oyxlclfx719KSIAuWAPhVMJ/Q0XHSlyaMQ0FOjOcbqpE6/QOK1ut89rNeptDwyRVvQ=; From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson Subject: [OSSTEST PATCH 5/7] ts-xen-install: Honour xenstored target var Date: Fri, 22 Jan 2021 15:56:01 +0000 Message-Id: <20210122155603.23402-5-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210122155603.23402-1-iwj@xenproject.org> References: <20210122155603.23402-1-iwj@xenproject.org> MIME-Version: 1.0 Nothing sets this yet. Signed-off-by: Ian Jackson --- Osstest/TestSupport.pm | 1 + ts-xen-install | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index 9e85303a..a0ca6943 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -179,6 +179,7 @@ our @accessible_runvar_pats = host_linux_boot_append *_host_linux_boot_append host_ip *_host_ip host_power_install *_host_power_install + host_xenstored *_host_xenstored ); #---------- test script startup ---------- diff --git a/ts-xen-install b/ts-xen-install index fc4bf423..47865eb6 100755 --- a/ts-xen-install +++ b/ts-xen-install @@ -142,6 +142,13 @@ sub adjustconfig () { ( "XENCONSOLED_TRACE" => "guest", ); + + my $xenstored = target_var($ho, 'xenstored'); + if (defined $xenstored) { + $xenstored = "/usr/local/sbin/$xenstored" unless $xenstored =~ m{/}; + push @commons_config, "XENSTORED", $xenstored; + } + target_editfile_root($ho, $commons_config_file, sub { target_editfile_kvp_replace(@commons_config) }); From patchwork Fri Jan 22 15:56:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 12039845 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 04CECC433DB for ; Fri, 22 Jan 2021 15:56:27 +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 AFCEF221FF for ; Fri, 22 Jan 2021 15:56:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AFCEF221FF Authentication-Results: mail.kernel.org; dmarc=pass (p=none dis=none) header.from=xenproject.org 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.72902.131430 (Exim 4.92) (envelope-from ) id 1l2ynI-0004fM-7b; Fri, 22 Jan 2021 15:56:16 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72902.131430; Fri, 22 Jan 2021 15:56:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2ynH-0004ey-La; Fri, 22 Jan 2021 15:56:15 +0000 Received: by outflank-mailman (input) for mailman id 72902; Fri, 22 Jan 2021 15:56:13 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2ynF-0004bJ-MZ for xen-devel@lists.xenproject.org; Fri, 22 Jan 2021 15:56:13 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2ynF-0002OY-Kz for xen-devel@lists.xenproject.org; Fri, 22 Jan 2021 15:56:13 +0000 Received: from iwj (helo=mariner.uk.xensource.com) by xenbits.xenproject.org with local-bsmtp (Exim 4.92) (envelope-from ) id 1l2ynF-0000Rz-Jw for xen-devel@lists.xenproject.org; Fri, 22 Jan 2021 15:56:13 +0000 Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by mariner.uk.xensource.com with esmtp (Exim 4.89) (envelope-from ) id 1l2ynD-0004Ar-T2; Fri, 22 Jan 2021 15:56:12 +0000 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" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=Du2uJm4oHuTzZSLlTawEiTsabsoS+t2X1zlx4gXyhUs=; b=E9G81hP+oAym6MuTYGG2cJTuTp 7fxw9LpolCWtEnrinBOYlOlzPkLJVuOtaXZkKsZloTGy56RnFcBWKhcPXZ7nBSrFbzJ/bJeXQUS7E fn/Le3aZfXcsfs2JRP4JLxulSqFF3IUPdjeJSSdVUIHfpANzAQXmI07J/IrTtzPHYcI4=; From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson Subject: [OSSTEST PATCH 6/7] mfi-common: Provide stripy_rand Date: Fri, 22 Jan 2021 15:56:02 +0000 Message-Id: <20210122155603.23402-6-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210122155603.23402-1-iwj@xenproject.org> References: <20210122155603.23402-1-iwj@xenproject.org> MIME-Version: 1.0 We will use this in a moment. Signed-off-by: Ian Jackson --- mfi-common | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/mfi-common b/mfi-common index 34b0c116..35efd233 100644 --- a/mfi-common +++ b/mfi-common @@ -31,6 +31,18 @@ stripy () { eval "$out_vn=\"\$out_$out_val\"" } +stripy_rand () { + # feel free to pass not-real values for $job + # if desired to perturb the hash, etc. + local job="$1"; shift + local out_vn="$1"; shift + local hash="$( echo "$job $out_vn" | sha256sum )" + hash="${hash:0:7}" + local ix=$(( (0x$hash * $#) / 0x10000000 + 1 )) + out_val="${@:$ix:1}" + eval "$out_vn=\"\$out_val\"" +} + branch_wants_migrupgrade_tests () { case "$branch" in xen-3.*-testing) return 1 ;; From patchwork Fri Jan 22 15:56:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 12039851 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 8C2F3C433E9 for ; Fri, 22 Jan 2021 15:56:27 +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 50BB8221FF for ; Fri, 22 Jan 2021 15:56:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 50BB8221FF Authentication-Results: mail.kernel.org; dmarc=pass (p=none dis=none) header.from=xenproject.org 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.72903.131446 (Exim 4.92) (envelope-from ) id 1l2ynJ-0004hA-1G; Fri, 22 Jan 2021 15:56:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72903.131446; Fri, 22 Jan 2021 15:56:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2ynI-0004gS-DU; Fri, 22 Jan 2021 15:56:16 +0000 Received: by outflank-mailman (input) for mailman id 72903; Fri, 22 Jan 2021 15:56:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2ynG-0004br-2j for xen-devel@lists.xenproject.org; Fri, 22 Jan 2021 15:56:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2ynG-0002Ob-1s for xen-devel@lists.xenproject.org; Fri, 22 Jan 2021 15:56:14 +0000 Received: from iwj (helo=mariner.uk.xensource.com) by xenbits.xenproject.org with local-bsmtp (Exim 4.92) (envelope-from ) id 1l2ynG-0000SN-0s for xen-devel@lists.xenproject.org; Fri, 22 Jan 2021 15:56:14 +0000 Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by mariner.uk.xensource.com with esmtp (Exim 4.89) (envelope-from ) id 1l2ynE-0004Ar-A8; Fri, 22 Jan 2021 15:56:12 +0000 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" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Content-Transfer-Encoding:Content-Type: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=Osxwv6TTrw4qA6JUSNzB0731pq0mWQGw3JpKLz3zbug=; b=DcTO6ijwTkiRFjISONoV7QY3MZ xVwFLntgb+X7NXlokxqGtM3h1aBy0cH1UjhxDEsMWIkI/b/Pk4FjTpmSzNZtuJmXJIrnLWmj6VOv7 tM116srHK6Su/Hla5r2vH6Aj/u4M6TXb/pPRgR/wM77fn2AoT0zlk3H9W3Qw5AiiwZwo=; From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson , =?utf-8?b?RWR3aW4gVMO2csO2aw==?= , Christian Lindig , Andrew Cooper , =?utf-8?b?SsO8cmdlbiBHcm/Dnw==?= , Wei Liu , Ian Jackson Subject: [OSSTEST PATCH 7/7] make-flight: Stripy xenstored Date: Fri, 22 Jan 2021 15:56:03 +0000 Message-Id: <20210122155603.23402-7-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210122155603.23402-1-iwj@xenproject.org> References: <20210122155603.23402-1-iwj@xenproject.org> MIME-Version: 1.0 Previously, we let the Xen build system and startup scripts choose which xenstored to use. Before we upgraded to Debian buster, that gave us C xentored tests on ARM. Since then, armhf and arm64 have both had enough ocaml support and we haven't been testing C xenstored at all ! Change this, by selecting between C xenstored and Ocaml xenstored "at random". Actually, this is based on the job name. So the same job in different branches will use the same xenstored - which helps avoid confusion. I have diffed the output of standalone-generate-dump-flight-runvars. As expected, this addes a variable all_host_xenstored to every job. To make sure we have enough diversity, I eyeballed the results. In particular: * The smoke tests now have 2 C and 2 Ocaml, one of each on ARM and x86. * XTF tests have 2 oxenstored and 3 C xenstored. * The ovmf flight has one of each * The seabios and libvirt flights look reasonably mixed. Most other flights have enough jobs that I think things are diverse enough without looking at them all in detail. I think this lack of testing needs fixing for the Xen 4.15 release. So after review I intend to push this to osstest pretest, and may force push it even if shows regressions. CC: Edwin Török CC: Christian Lindig CC: Andrew Cooper CC: Jürgen Groß CC: Wei Liu Signed-off-by: Ian Jackson Release-Acked-by: Ian Jackson Acked-by: Christian Lindig --- mfi-common | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/mfi-common b/mfi-common index 35efd233..2834411f 100644 --- a/mfi-common +++ b/mfi-common @@ -509,6 +509,13 @@ job_create_test () { xenbuildjob="${bfi}build-$xenarch$xsm_suffix" buildjob="${bfi}build-$dom0arch$xsm_suffix" + local xenstored="$xenstored" + if [ "$xenstored" = "" ]; then + stripy_rand "$job 2" xenstored xenstored oxenstored + # Without " ", all XTF jobs use oxenstored + # With " 1", All OVMF tests use xenstored + fi + job_create_test_filter_callback \ "$job" "$recipe" "$toolstack" "$xenarch" "$dom0arch" "$@" || return 0 @@ -529,7 +536,8 @@ job_create_test () { ./cs-job-create $flight $job $recipe toolstack=$toolstack \ $RUNVARS $TEST_RUNVARS $global_runvars $most_runvars \ - xenbuildjob=$xenbuildjob buildjob=$buildjob $tsbuildjob "$@" + xenbuildjob=$xenbuildjob buildjob=$buildjob \ + all_host_xenstored=$xenstored $tsbuildjob "$@" } usual_debianhvm_image () {