From nobody Sun May 5 06:03:56 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1556296960; cv=none; d=zoho.com; s=zohoarc; b=UgitRDurTUJNJkC8OmWzSidJmRIxYPaSFbE93RPBCiWixx92thJ76GhUL6fvHleTTEgQqiO0SskdLAqIaGc1/vj/XMlIlcdxE8j0XCqYlbQtCEQk8NItdRK8bTKncmMfdFHvlvPrxU7vJwu1zmpjxLzw8MGkDQI7kGpy+4xbbJU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556296960; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=LCBg7o2bZnAOWTbQAxA9QjUvJbyEdPgQQq7a1TNlk6c=; b=CKcg5K5YAUZ/77YE49uZC91zw13MSdEOw3yLZpCOhDfFyxF/3Fm1U9NQTRxujFckdPDxxPQhVDGx6Y3h5W134W5Pme84HlBVK2HWsfwDD/LUKmNAVltom1SekDYix07Rjy6fzN3fMLmJUXNVdJ3cBffhq93aVI/c1ZVGlEsPu9c= ARC-Authentication-Results: i=1; mx.zoho.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1556296960087319.20984192378455; Fri, 26 Apr 2019 09:42:40 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3ub-00083G-Tj; Fri, 26 Apr 2019 16:41:21 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3ua-000836-Ll for xen-devel@lists.xenproject.org; Fri, 26 Apr 2019 16:41:20 +0000 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 1d915710-6842-11e9-843c-bc764e045a96; Fri, 26 Apr 2019 16:41:18 +0000 (UTC) X-Inumbo-ID: 1d915710-6842-11e9-843c-bc764e045a96 X-IronPort-AV: E=Sophos;i="5.60,398,1549929600"; d="scan'208";a="84519653" From: Ian Jackson To: Date: Fri, 26 Apr 2019 17:39:48 +0100 Message-ID: <20190426164002.22381-2-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190426164002.22381-1-ian.jackson@eu.citrix.com> References: <20190426164002.22381-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 01/15] TestSupport: target_var: Refactor to allow for another host case 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: Ian Jackson Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Make an explicit list of the prefixes and a loop to walk over them. No functional change. Signed-off-by: Ian Jackson --- Osstest/TestSupport.pm | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index ec867e4f..fcbde0a2 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -2471,10 +2471,18 @@ sub target_var_prefix ($) { =20 sub target_var ($$) { my ($ho,$vn) =3D @_; - my $pfx =3D target_var_prefix($ho); - my $allthing =3D exists $ho->{Guest} ? "guest" : "host"; - return $r{ $pfx. $vn } // - $r{ "all_${allthing}_${vn}" }; + my @prefixes; + push @prefixes, target_var_prefix($ho); + if (exists $ho->{Guest}) { + push @prefixes, 'all_guest_'; + } else { + push @prefixes, 'all_host_'; + } + foreach my $prefix (@prefixes) { + my $v =3D $r{ $prefix.$vn }; + return $v if defined $v; + } + return undef; } =20 sub target_kernkind_check ($) { --=20 2.11.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel From nobody Sun May 5 06:03:56 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1556296960; cv=none; d=zoho.com; s=zohoarc; b=EZwjw34p0gOizZE81gonhLkwEN0ZxsOQF9ubmO0BIbva4MTJnMSbiKyL3Xd129MDZ56soDIUQP57mHpngDHzUKK5ThcdgFVOS/6lWfldV/zVfKLyIGYbrILlvPseWf7+hYYRAwit8jgVnkqd7rZV8auPVNt8Ws4PjU+yW43XEFs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556296960; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=a6f4rfmtqDh0c0Mf0Q7fFCtFhZiBMp3J5ZLVZ4Pb2P8=; b=EJqESAbqp16djhSRtmv7chNCWuc1inzjJ2F/giOIY/IILCxqHw8STzPRIasge3bXod24na1pxJaJQQQ8m0KR0E9TS3/ozHpLj7BB60CMvjx2EOCkwwFZvQyR45JRc2/LKiBLQu6n0wa5F+Y6tGgVcmu/HSGMmq0SQzuSe/5A6Ws= ARC-Authentication-Results: i=1; mx.zoho.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1556296960301490.492474831438; Fri, 26 Apr 2019 09:42:40 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3uf-000848-6L; Fri, 26 Apr 2019 16:41:25 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3ud-00083p-UV for xen-devel@lists.xenproject.org; Fri, 26 Apr 2019 16:41:23 +0000 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 200fcf27-6842-11e9-843c-bc764e045a96; Fri, 26 Apr 2019 16:41:22 +0000 (UTC) X-Inumbo-ID: 200fcf27-6842-11e9-843c-bc764e045a96 X-IronPort-AV: E=Sophos;i="5.60,398,1549929600"; d="scan'208";a="84519668" From: Ian Jackson To: Date: Fri, 26 Apr 2019 17:39:49 +0100 Message-ID: <20190426164002.22381-3-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190426164002.22381-1-ian.jackson@eu.citrix.com> References: <20190426164002.22381-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 02/15] TestSupport: target_var: Use host_V for host variables 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: Ian Jackson Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Change `target_var' to set `IDENT_V' rather than just V. For compatibility with older flights and older flight construction, look for plain V too when looking up the variable. And, we now look at all_host_V before V. This has no functional change with existing flights, because existing flights only have all_host_suite all_host_di_version all_host_os and we never set the corresponding V form of those variables. So with existing flights the only functional change is a change to synth runvars, to add HOST_ to the name. Signed-off-by: Ian Jackson --- Osstest/TestSupport.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index fcbde0a2..6ab64d56 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -2465,8 +2465,7 @@ sub guest_await ($$) { =20 sub target_var_prefix ($) { my ($ho) =3D @_; - if (exists $ho->{Guest}) { return $ho->{Guest}.'_'; } - return ''; + return (exists $ho->{Guest} ? $ho->{Guest} : $ho->{Ident}).'_'; } =20 sub target_var ($$) { @@ -2477,6 +2476,7 @@ sub target_var ($$) { push @prefixes, 'all_guest_'; } else { push @prefixes, 'all_host_'; + push @prefixes, ''; } foreach my $prefix (@prefixes) { my $v =3D $r{ $prefix.$vn }; --=20 2.11.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel From nobody Sun May 5 06:03:56 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1556296963; cv=none; d=zoho.com; s=zohoarc; b=lFuB4OTPQvQWqP0XqdxGl1SndEu2PnE9USYXxvZiGvdMR26BqNEoFZ0+aCb27m78ZsiewnpF+AVk2TvtcHBlrs4RrZlYmOnQJDvGW+Z4YgKyvSJIkBigaBvG0ORG8Q3w6kAfZuPzLGj3jm4w7nJ3I+CCIvOxMA3Rr0IKmi2Wu+k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556296963; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=ZWM/5s+iftaAJ31eI2j2LZ3UNl0x6q8+DvJO/cAF4CM=; b=giShs7rwIrib7jnlsD9riZr6DJVnntC7PyQejQLJtHMkGDRLQoso7Yq3l04J2sSYxHwkB+vS4oSAFl435htbQcuzvO51zp++57cFF9tvU93uCaCChuf7d+m9E+lDLs8pOxQuJeWNe6CUl6erXwDSndOR8hLkkOoEP7R53RwZUis= ARC-Authentication-Results: i=1; mx.zoho.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1556296963153212.4153595931857; Fri, 26 Apr 2019 09:42:43 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3uf-00084R-FY; Fri, 26 Apr 2019 16:41:25 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3ue-00083v-7O for xen-devel@lists.xenproject.org; Fri, 26 Apr 2019 16:41:24 +0000 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 207be34f-6842-11e9-843c-bc764e045a96; Fri, 26 Apr 2019 16:41:23 +0000 (UTC) X-Inumbo-ID: 207be34f-6842-11e9-843c-bc764e045a96 X-IronPort-AV: E=Sophos;i="5.60,398,1549929600"; d="scan'208";a="84519669" From: Ian Jackson To: Date: Fri, 26 Apr 2019 17:39:50 +0100 Message-ID: <20190426164002.22381-4-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190426164002.22381-1-ian.jackson@eu.citrix.com> References: <20190426164002.22381-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 03/15] arch replumbing: ts-host-install: Move $kern_arch_info setting 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: Ian Jackson Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" We are going to want to do this after selecthost. No functional change. Signed-off-by: Ian Jackson --- ts-host-install | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/ts-host-install b/ts-host-install index 45f04764..3c14f171 100755 --- a/ts-host-install +++ b/ts-host-install @@ -31,7 +31,7 @@ my $debconf_priority; my $poweron_test_only; =20 our %xopts; -our $kern_arch_info; +our $build; =20 while (@ARGV and $ARGV[0] =3D~ m/^-/) { $_=3D shift @ARGV; @@ -43,12 +43,7 @@ while (@ARGV and $ARGV[0] =3D~ m/^-/) { } elsif (m/^--rescue$/) { $xopts{RescueMode}=3D 1; } elsif (m/^--build$/) { - if ($r{arch} eq 'i386') { - $kern_arch_info =3D { - Kernel_Debian =3D> 'amd64', - Userland_setarch =3D> 'i386', - }; - } + $build =3D 1; } else { die "$_ $!"; } @@ -63,6 +58,17 @@ exit 0 if $ho->{SharedReady}; our %timeout=3D qw(ReadPreseed 350 Sshd 2400); =20 +our $kern_arch_info; + +if ($build) { + if ($r{arch} eq 'i386') { + $kern_arch_info =3D { + Kernel_Debian =3D> 'amd64', + Userland_setarch =3D> 'i386', + }; + } +} + sub install () { my ($ps_url,$ps_file)=3D preseed_create ($ho, '', --=20 2.11.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel From nobody Sun May 5 06:03:56 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1556296969; cv=none; d=zoho.com; s=zohoarc; b=IQ/Eq2qoXUPQJYabfbBK5m0n9ofQpVKB2wpJy+H9gFnQ0s2v9Ka3EZoChe29PwDqY8UqlhYiHZxtjSEujCcg1GfQTqBqc5Hq7ndOYZpeModPSZnwrk4rHuhhB+yI8HPIUoDeZ8jIbpFLK5cqmTg5qAOjPxWWzOLefdlfPMIPSOw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556296969; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=uMEWM20BXvQxftIfk7auhcoGIG6enGb2Ual6ufh/Oos=; b=JRfXpQ14QHoZyWIhcDax8igTtwTBX02Cqv6ke91Q0dwYfo/0MfTenb2TT3K8r/uyX7dS0ScjMZ5jZb/K/BSW+I/oEK4dTShL8UBCZEpBB5OiUL6gPBT5YJzGuvvE9mXaAY9+rYf6efg87RAnZc+A4YQbhf9nDIuTfYMEWdUMbH8= ARC-Authentication-Results: i=1; mx.zoho.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1556296969411150.03348856477612; Fri, 26 Apr 2019 09:42:49 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3uk-00086f-2j; Fri, 26 Apr 2019 16:41:30 +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.89) (envelope-from ) id 1hK3ui-00085i-Rb for xen-devel@lists.xenproject.org; Fri, 26 Apr 2019 16:41:28 +0000 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 212b8e30-6842-11e9-86e3-13b5ef7dec5c; Fri, 26 Apr 2019 16:41:25 +0000 (UTC) X-Inumbo-ID: 212b8e30-6842-11e9-86e3-13b5ef7dec5c X-IronPort-AV: E=Sophos;i="5.60,398,1549929600"; d="scan'208";a="84519676" From: Ian Jackson To: Date: Fri, 26 Apr 2019 17:39:51 +0100 Message-ID: <20190426164002.22381-5-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190426164002.22381-1-ian.jackson@eu.citrix.com> References: <20190426164002.22381-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 04/15] arch replumbing: Provide $ho->{Arch} and $gho->{Arch} 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: Ian Jackson Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" With existing flights these are $r{arch} and GUEST_arch. Nothing uses these yet. Signed-off-by: Ian Jackson --- Osstest/TestSupport.pm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index 6ab64d56..16c17e37 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -1164,6 +1164,7 @@ sub selecthost ($) { NestingLevel =3D> 0, Info =3D> [], }; + $ho->{Arch} =3D target_var($ho, 'arch') or warn "unknown arch for $ide= nt"; if (defined $job) { $ho->{Suite} =3D target_var($ho, "suite") // $c{DebianSuite}; $ho->{DiVersion} =3D target_var($ho, "di_version") @@ -1795,6 +1796,7 @@ sub selectguest ($$) { Host =3D> $ho, Suite =3D> $r{"${gn}_suite"}, }; + $ho->{Arch} =3D target_var($ho, 'arch') or warn "unknown arch for $gn"; foreach my $opt (guest_var_commalist($gho,'options')) { $gho->{Options}{$opt}++; } --=20 2.11.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel From nobody Sun May 5 06:03:56 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1556296965; cv=none; d=zoho.com; s=zohoarc; b=myz62m6oqUtijZJNm7UCtulpEKw4ZxxsQQWqeXJJya0PCZrNhC3P1xPtAeITED8xVjZWR81euDYifFyu2GCGPwmVDf7Jw0HQZmdwxFiXzxVA7R0tltRKbMRmqYgjm9aN8wG/9xmYzCG4OL2JaU2kJfhuwyNOlNcHkozhDO6h+gM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556296965; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=cZr/Msf34QtOD4pYW+bojKxSPSpdBfbXXGUpqgPhojw=; b=RahEbX4HdrGeHwTSXzRrPMogmXxXM+qW/j6W/IJFwK/ZlbAAq/DxVZyK3d7krZKMFLTRdqETsr5HjLPxVBtqj0/kswp5m9iYctN3wm2XHB844uKRHTTMFwvh2e41eBS27BTK3pH46BhPex9nSDKZo0P8iEfz98DO70110rM8mXw= ARC-Authentication-Results: i=1; mx.zoho.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1556296965470699.2289549043345; Fri, 26 Apr 2019 09:42:45 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3uj-00086J-Pb; Fri, 26 Apr 2019 16:41:29 +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.89) (envelope-from ) id 1hK3ui-00085j-Rd for xen-devel@lists.xenproject.org; Fri, 26 Apr 2019 16:41:28 +0000 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 221a9250-6842-11e9-8fdb-bf422ca13659; Fri, 26 Apr 2019 16:41:26 +0000 (UTC) X-Inumbo-ID: 221a9250-6842-11e9-8fdb-bf422ca13659 X-IronPort-AV: E=Sophos;i="5.60,398,1549929600"; d="scan'208";a="84519685" From: Ian Jackson To: Date: Fri, 26 Apr 2019 17:39:52 +0100 Message-ID: <20190426164002.22381-6-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190426164002.22381-1-ian.jackson@eu.citrix.com> References: <20190426164002.22381-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 05/15] arch replumbing: ts-debian-di-install: Remove unidiomatic { } 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: Ian Jackson Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" No functional change. Signed-off-by: Ian Jackson --- ts-debian-di-install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ts-debian-di-install b/ts-debian-di-install index 361a1710..5cb3d35d 100755 --- a/ts-debian-di-install +++ b/ts-debian-di-install @@ -152,10 +152,10 @@ sub setup_netboot($$$) die if $r{ "$gho->{Guest}_netboot_kernel" } || $r{ "$gho->{Guest}_netboot_ramdisk" }; =20 - my $di_path =3D $c{TftpPath}.'/'.$gho->{Tftp}{DiBase}.'/'.${arch}.'/'. + my $di_path =3D $c{TftpPath}.'/'.$gho->{Tftp}{DiBase}.'/'.$arch.'/'. debian_guest_di_version($gho).'-'.$gho->{Suite}; =20 - if (${arch} =3D~ m/amd64|i386/) { + if ($arch =3D~ m/amd64|i386/) { $kernel =3D "$di_path/vmlinuz-xen"; $ramdisk =3D "$di_path/initrd.gz-xen"; } else { --=20 2.11.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel From nobody Sun May 5 06:03:56 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1556296966; cv=none; d=zoho.com; s=zohoarc; b=hlkzwdxshFftUY3/+5BM+NZwQsvvxO8Au0676Q+1gpeKXHvdqG1RetCEIHtz/2J3U7W6Z+4xAAQQYxqDVD/JUy1E9C43B/kgIJyeJ8G0WsAVgKTT32rY85rENfPVS93z7elleFcRjHmr4UWbQZNBmyll8VCbVbd3m/yikktlTVo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556296966; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=wefUz2nWlWUsY9O6xxFyXyPF6mITuEZV8HV/N3A5Yw4=; b=bePA0bkY34t5PT+BMmVo7DkMno64R3hZsX72zgEhZbEps7bwNzycfZ2M5X/fNlKagsKnN3TWsbwNPsq3vjQAqcqjdfJeqE8tnt1DNbWMr9SiuROxXkGlnHALpBABYfJzpfZlkCg+ftnBk6jKiDMxRBflmOm+mqKk1TCGq0/ZVnM= ARC-Authentication-Results: i=1; mx.zoho.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1556296966763362.4945542481354; Fri, 26 Apr 2019 09:42:46 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3ul-00087w-C8; Fri, 26 Apr 2019 16:41:31 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3uj-00086B-KA for xen-devel@lists.xenproject.org; Fri, 26 Apr 2019 16:41:29 +0000 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 22bbb1a8-6842-11e9-843c-bc764e045a96; Fri, 26 Apr 2019 16:41:28 +0000 (UTC) X-Inumbo-ID: 22bbb1a8-6842-11e9-843c-bc764e045a96 X-IronPort-AV: E=Sophos;i="5.60,398,1549929600"; d="scan'208";a="84519692" From: Ian Jackson To: Date: Fri, 26 Apr 2019 17:39:53 +0100 Message-ID: <20190426164002.22381-7-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190426164002.22381-1-ian.jackson@eu.citrix.com> References: <20190426164002.22381-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 06/15] arch replumbing: ts-memdisk-try-append: Remove unidiomatic " " 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: Ian Jackson Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" No functional change. Signed-off-by: Ian Jackson --- ts-memdisk-try-append | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ts-memdisk-try-append b/ts-memdisk-try-append index 67c250bd..f6ec2fd5 100755 --- a/ts-memdisk-try-append +++ b/ts-memdisk-try-append @@ -23,7 +23,7 @@ arch=3D`perl -e ' use Osstest::TestSupport; =20 tsreadconfig(); - print $r{"arch"} or die $!; + print $r{arch} or die $!; '` =20 case "$arch" in --=20 2.11.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel From nobody Sun May 5 06:03:56 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1556296967; cv=none; d=zoho.com; s=zohoarc; b=kARqA9qM3quNciACoR+UqprMoenyxUNKqrULO7OZGFP3DVdPs+2Dqg0felBkTQrpjiR1MVde1FrrAWqa/eX99ai7v3lwJJkJ2hN2cP7+N8IupNku3H82DiSafezL5e48RKAAu8wfxAyDIMtlwKDt6FpEQm0PPBgLlfN+fp70nkk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556296967; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=Sci1DM+TpYOU6PTFmYCzMkT0rjZOBcNEjFexG9rKzDc=; b=SBnoYsUq3NfBGjH7a1AOJ57tnHWPP4aueaEiSccVzfcZOAMyad5xDhgRIDEmICKmK1i6wM6tYKjlpm2ChDSnv8KyVNoHgJywU3WV796g6lNsSYVx6xLxAGmBb1P5ToRuwQkPKLAQfgUP+U7Cn0PE0WwcsueeCreIcOhMhU9F4E8= ARC-Authentication-Results: i=1; mx.zoho.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1556296967721538.5320006171835; Fri, 26 Apr 2019 09:42:47 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3ul-00088L-MC; Fri, 26 Apr 2019 16:41:31 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3uj-00086I-St for xen-devel@lists.xenproject.org; Fri, 26 Apr 2019 16:41:29 +0000 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 23b47482-6842-11e9-843c-bc764e045a96; Fri, 26 Apr 2019 16:41:28 +0000 (UTC) X-Inumbo-ID: 23b47482-6842-11e9-843c-bc764e045a96 X-IronPort-AV: E=Sophos;i="5.60,398,1549929600"; d="scan'208";a="84519698" From: Ian Jackson To: Date: Fri, 26 Apr 2019 17:39:54 +0100 Message-ID: <20190426164002.22381-8-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190426164002.22381-1-ian.jackson@eu.citrix.com> References: <20190426164002.22381-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 07/15] arch replumbing: Replace many $r{arch} with $[g]ho->{Arch} 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: Ian Jackson Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" No functional change with existing flights. But the effect is that now, generally, ts-* scripts and the support code will honour host_arch, if it is set, in preference to arch. This patch contains only replacements of $r{arch} with $ho->{Arch} or $gho->{Arch}. In fact, perhaps surprisingly, there were no locations where $gho was wanted rather than $ho (I have double checked this). Exceptions, where we left $r{arch} alone, are: * make-flight: a comment, which we are about to deal with; * ts-kernel-build: we are going to support cross building and $r{arch} is going to be the architecture of the kernel we want rather than of the build host. Signed-off-by: Ian Jackson --- Osstest/Debian.pm | 14 +++++++------- Osstest/TestSupport.pm | 4 ++-- ts-freebsd-build | 2 +- ts-host-install | 6 +++--- ts-memdisk-try-append | 2 +- ts-xen-build-prep | 4 ++-- ts-xen-install | 8 ++++---- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm index 8abd6aed..911d8905 100644 --- a/Osstest/Debian.pm +++ b/Osstest/Debian.pm @@ -444,7 +444,7 @@ sub setupboot_grub2 ($$$$) { # Grub2 on jessie/stretch ARM* doesn't do multiboot, so we must chainl= oad. my $need_uefi_chainload =3D get_host_property($ho, "firmware", "") eq "uefi" && - $ho->{Suite} =3D~ m/jessie|stretch/ && $r{arch} =3D~ m/^arm/; + $ho->{Suite} =3D~ m/jessie|stretch/ && $ho->{Arch} =3D~ m/^arm/; =20 my $parsemenu=3D sub { my $f=3D bl_getmenu_open($ho, $rmenu, "$stash/$ho->{Name}--grub.cf= g.1"); @@ -749,7 +749,7 @@ END sub preseed_microcode($$) { my ($ho,$sfx) =3D @_; - my $prop =3D "MicrocodeUpdate".ucfirst($r{arch}); + my $prop =3D "MicrocodeUpdate".ucfirst($ho->{Arch}); return unless $c{$prop}; logm("ucode=3D$prop $c{$prop}"); my $ucode =3D get_filecontents("$c{Images}/$c{$prop}"); @@ -1134,7 +1134,7 @@ sub di_installer_path ($) { # useable for constructing host paths as well as guest paths my ($ho) =3D @_; =20 - return $ho->{Tftp}{DiBase}.'/'.$r{arch}.'/'. + return $ho->{Tftp}{DiBase}.'/'.$ho->{Arch}.'/'. ($ho->{DiVersion} // cfg_tftp_di_version($ho->{Suite})) .'-'.$ho->{Suite}; } @@ -1340,8 +1340,8 @@ END # Userland_setarch personality to restore using setarch my $kern_arch =3D $kern_arch_info->{Kernel_Debian}; if ($kern_arch && - $ho->{Flags}{"arch-$r{arch}"} && !$ho->{Flags}{"arch-$kern_arch"}) { - # We check the flag for $r{arch} because for various reasons + $ho->{Flags}{"arch-$ho->{Arch}"} && !$ho->{Flags}{"arch-$kern_arch"}) { + # We check the flag for $ho->{Arch} because for various reasons # it may not be set. For example, in standalone mode it is # currently not normally necessary to set any arch hostflags. # In that situation we bet that the kern arch can be used; @@ -1356,7 +1356,7 @@ END } if ($kern_arch) { my $setarch =3D "setarch $kern_arch_info->{Userland_setarch}"; - logm("Using $kern_arch kernel for $r{arch} userland ($setarch)"); + logm("Using $kern_arch kernel for $ho->{Arch} userland ($setarch)"); preseed_hook_command($ho, 'late_command', $sfx, <{Arch} kernels end up being the default so shuffle them # where update-grub will not find them for f in /boot/vmlinu*; do dpkg-divert --rename --divert "/boot/~disable~\${f##*/}" "\$f" diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index 16c17e37..18617d98 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -2904,8 +2904,8 @@ sub setup_netboot_local_uefi ($) { # i386 is X64 because when we are trying to install i386 # on a UEFI box, it's actually an amd64-capable UEFI box # which expects a 64-bit EFI loader - die "EFI arch" unless $efi_archs{ $r{arch} }; - my $efi =3D $efi_archs{ $r{arch} }; + die "EFI arch" unless $efi_archs{ $ho->{Arch} }; + my $efi =3D $efi_archs{ $ho->{Arch} }; setup_netboot_bootcfg($ho, <{Arch} END =20 # Build process as documented in the handbook: diff --git a/ts-host-install b/ts-host-install index 3c14f171..4bfa2f5e 100755 --- a/ts-host-install +++ b/ts-host-install @@ -61,7 +61,7 @@ our %timeout=3D qw(ReadPreseed 350 our $kern_arch_info; =20 if ($build) { - if ($r{arch} eq 'i386') { + if ($ho->{Arch} eq 'i386') { $kern_arch_info =3D { Kernel_Debian =3D> 'amd64', Userland_setarch =3D> 'i386', @@ -262,7 +262,7 @@ END push @dicmdline, "domain=3D$c{TestHostDomain}"; push @dicmdline, get_host_property($ho, "install-append $ho->{Suite}", ''), - get_host_property($ho, "install-append $ho->{Suite} $r{arch}", ''); + get_host_property($ho, "install-append $ho->{Suite} $ho->{Arch}", = ''); =20 my $console =3D get_host_native_linux_console($ho); =20 @@ -280,7 +280,7 @@ END =20 push @hocmdline, get_host_property($ho, "linux-boot-append $ho->{Suite}", ''), - get_host_property($ho, "linux-boot-append $ho->{Suite} $r{arch}", = ''); + get_host_property($ho, "linux-boot-append $ho->{Suite} $ho->{Arch}= ", ''); =20 $xopts{ipappend} =3D $ipappend; setup_netboot_di($ho, $kernel, "/$initrd", \@dicmdline, \@hocmdline, diff --git a/ts-memdisk-try-append b/ts-memdisk-try-append index f6ec2fd5..ce39d5a7 100755 --- a/ts-memdisk-try-append +++ b/ts-memdisk-try-append @@ -23,7 +23,7 @@ arch=3D`perl -e ' use Osstest::TestSupport; =20 tsreadconfig(); - print $r{arch} or die $!; + print $ho->{Arch} or die $!; '` =20 case "$arch" in diff --git a/ts-xen-build-prep b/ts-xen-build-prep index c38ab36d..0f07648e 100755 --- a/ts-xen-build-prep +++ b/ts-xen-build-prep @@ -246,7 +246,7 @@ END if ($ho->{Suite} !~ m/lenny|squeeze/) { target_install_packages($ho, 'libfdt-dev'); } - if ($r{arch} eq 'amd64' && $ho->{Suite} !~ m/squeeze|lenny/) { + if ($ho->{Arch} eq 'amd64' && $ho->{Suite} !~ m/squeeze|lenny/) { target_install_packages($ho, 'libc6-dev-i386'); } } @@ -269,4 +269,4 @@ if (!$ho->{Flags}{'no-reinstall'}) { gitcache_setup($ho); } =20 -host_shared_mark_ready($ho, "build-".$ho->{Suite}."-".$r{arch}); +host_shared_mark_ready($ho, "build-".$ho->{Suite}."-".$ho->{Arch}); diff --git a/ts-xen-install b/ts-xen-install index 9f78a75f..2d3c644d 100755 --- a/ts-xen-install +++ b/ts-xen-install @@ -64,7 +64,7 @@ sub packages () { if ($ho->{Suite} !~ m/lenny|squeeze/) { target_install_packages($ho, qw(libfdt1)); } - if ($r{arch} eq 'i386') { + if ($ho->{Arch} eq 'i386') { target_install_packages($ho, qw(libc6-xen)); } target_install_packages($ho, @{toolstack($ho)->{ExtraPackages}}) @@ -92,7 +92,7 @@ sub some_extradebs ($) { target_install_packages($ho, qw(rsync)) unless $rsync_installed++; target_putfile_root($ho,300, "$path/.", $ontarget, '-r'); } elsif ($path =3D~ m{\.deb$}) { - $path =3D~ s{_\.deb}{ "_$r{arch}.deb" }e; + $path =3D~ s{_\.deb}{ "_$ho->{Arch}.deb" }e; logm("$cfgvar: installing $path"); $ontarget =3D basename($path); $dpkgopts =3D '-iB'; @@ -115,7 +115,7 @@ sub extradebs () { =20 # $c{ DebianExtraPackages___ } my $firmware =3D get_host_property($ho, "firmware", "bios"); - some_extradebs([ 'DebianExtraPackages', $firmware, $r{arch}, $suite ]); + some_extradebs([ 'DebianExtraPackages', $firmware, $ho->{Arch}, $suite= ]); } =20 sub extract () { @@ -193,7 +193,7 @@ sub setupboot () { my $xenhopt=3D "conswitch=3Dx watchdog noreboot async-show-all"; =20 my $cons=3D get_host_property($ho, 'XenSerialConsole', - $r{arch} =3D~ m/^arm/ ? 'dtuart' + $ho->{Arch} =3D~ m/^arm/ ? 'dtuart' : 'com1'); =20 if ( $cons eq "com1" ) { --=20 2.11.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel From nobody Sun May 5 06:03:56 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1556296969; cv=none; d=zoho.com; s=zohoarc; b=QdTPR/kVmGlPvMv2k+wBa1I9i0nPLy4I4guJpgB/E0SRTQWst4oriDU/X3qdl//0sDDJe7RxdHHtel9rKctRL8NOYBwtnegSYKXGjYAsqM313Udw2AS57RYUZH7HYJchC93G9BBU5UBExOUj6yUOH/YSKPCW4GZlxfmTAreuuJU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556296969; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=tiqKhuPpNgTNJVzFh4+CTciAK8BFqfhsdBdTO13KkMI=; b=ickojFJZwu3Sy6g8Vz4XiX1tm7NjWSPBCzQZEASmWfnJ9PaB7XK+4+S7lRzsFtQUeDMKSa+BogyjUgfmB1pfGzIL/DsAPQlAOiD1TT7FtmEVRHOlH4LKDQvnG23iNMCgdidUg7y+cMTyW8Ck/WLbmyhvO8D29mULsZgtOLtLqtI= ARC-Authentication-Results: i=1; mx.zoho.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1556296969248689.6729024043017; Fri, 26 Apr 2019 09:42:49 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3um-00089R-BL; Fri, 26 Apr 2019 16:41:32 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3ul-00087i-55 for xen-devel@lists.xenproject.org; Fri, 26 Apr 2019 16:41:31 +0000 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 2451b3cb-6842-11e9-843c-bc764e045a96; Fri, 26 Apr 2019 16:41:29 +0000 (UTC) X-Inumbo-ID: 2451b3cb-6842-11e9-843c-bc764e045a96 X-IronPort-AV: E=Sophos;i="5.60,398,1549929600"; d="scan'208";a="84519708" From: Ian Jackson To: Date: Fri, 26 Apr 2019 17:39:55 +0100 Message-ID: <20190426164002.22381-9-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190426164002.22381-1-ian.jackson@eu.citrix.com> References: <20190426164002.22381-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 08/15] arch replumbing: make-flight: Fix $r{arch} comment 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: Ian Jackson Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" This comment was lamenting the very problem we are fixing now. It would now be possible to test i386->amd64 tools migration, by writing an appropriate test job with different src_host_arch and dst_host_arch etc. Signed-off-by: Ian Jackson --- make-flight | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make-flight b/make-flight index c5411412..020ad5f1 100755 --- a/make-flight +++ b/make-flight @@ -833,8 +833,8 @@ test_matrix_do_one () { all_hostflags=3D"$hf" fi # TODO it would be nice to test i386->amd64 tools migration too (for - # Xen >=3D 4.6), but currently $r{arch} is used in several places, - # which would need looking at. + # Xen >=3D 4.6). Previously $r{arch} was used in several places, + # which made this more complicated, but this is now fixed. fi =20 if [ x$test_pvh =3D xy -a $xenarch =3D amd64 -a $dom0arch =3D amd64 ]; t= hen --=20 2.11.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel From nobody Sun May 5 06:03:56 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1556296972; cv=none; d=zoho.com; s=zohoarc; b=f+blK9FNMWzGpJa9n7dVrHaFBQG6Zzzy5wAZ3o2cl1DMB3xyKuDkgEIz063nHjO9TYeJPu/zrFop8Yfjx9ZNd5uGStQD637+bAcdLfXRjnsis5qBZ6/0z+ISnpDgiKLE0iNMf5Gy2Q8dhh4gmzPb72Z1KMaEEc/uVE6kYl6cers= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556296972; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=6IoCLQo8fiyeBkeTZ1GTN3HvxhS4XvfalCZ/uoH0BPI=; b=Y0k10wKg5BEqA48Umr+dXhnXvQrx6OFYxtpcOBode19Mxo9hjq3Af2BoI4yKYIGV6oIHVvPAkNjYthjiEVOVKDTFaykegd6UZDKk85Y9CosqkoPQVXQ+jZ5Kh31K2mUnNAuN6ehTrRhF6rMGUD0awWBfDlt2m0o2o3yQL6tnAqw= ARC-Authentication-Results: i=1; mx.zoho.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1556296972464602.2627520643673; Fri, 26 Apr 2019 09:42:52 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3up-0008DE-Nq; Fri, 26 Apr 2019 16:41: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.89) (envelope-from ) id 1hK3uo-0008Bj-54 for xen-devel@lists.xenproject.org; Fri, 26 Apr 2019 16:41:34 +0000 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 24ca6f70-6842-11e9-809e-b371eaf24b5c; Fri, 26 Apr 2019 16:41:31 +0000 (UTC) X-Inumbo-ID: 24ca6f70-6842-11e9-809e-b371eaf24b5c X-IronPort-AV: E=Sophos;i="5.60,398,1549929600"; d="scan'208";a="84519715" From: Ian Jackson To: Date: Fri, 26 Apr 2019 17:39:56 +0100 Message-ID: <20190426164002.22381-10-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190426164002.22381-1-ian.jackson@eu.citrix.com> References: <20190426164002.22381-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 09/15] arch replumbing: ts-debian-di-install: Use $gho->{Arch} 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: Ian Jackson Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" This is just tidying up. The only effect is that now these would honour $r{all_guest_arch} as a fallback. But right now, $r{GUEST_arch} will always be set, and that is what ends up in $gho->{Arch}. Signed-off-by: Ian Jackson --- ts-debian-di-install | 2 +- ts-debian-install | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ts-debian-di-install b/ts-debian-di-install index 5cb3d35d..9abb4956 100755 --- a/ts-debian-di-install +++ b/ts-debian-di-install @@ -174,7 +174,7 @@ END } =20 sub ginstall () { - my $arch=3D $r{"$gho->{Guest}_arch"}; + my $arch=3D $gho->{Arch}; my $method=3D $r{"$gho->{Guest}_method"}; =20 my $tmpdir=3D "/root/$flight-$job-di"; diff --git a/ts-debian-install b/ts-debian-install index 5bbaead0..f07dd676 100755 --- a/ts-debian-install +++ b/ts-debian-install @@ -47,7 +47,7 @@ sub prep () { } =20 sub ginstall () { - my $arch=3D $r{"$gho->{Guest}_arch"}; + my $arch=3D $gho->{Arch}; my $archarg=3D defined($arch) ? "--arch $arch" : ''; my $gsuite=3D debian_guest_suite($gho); =20 --=20 2.11.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel From nobody Sun May 5 06:03:56 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1556296973; cv=none; d=zoho.com; s=zohoarc; b=ejQRy0l+PkxJ4Cm2A/rGt27Ho6mT4M3xUOievzP8K4/xlMt5N/33K564Z+aJmmJCXEkBq1RyHFpkwNmUZ8fTSbwTlWF0AcB/5+GIFc5MB6PmGhtE3IR65uc0p341oqApQ4etQo4UFG38Eo/LCmL/LNso1LKBJnxAn5OPXID5oLk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556296973; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=di+wk96kkzuuNBw/iwDywlI6EZhYNPvW1RIrq24LXXA=; b=WPfP4Kupobv2vShtvQ3MtO6PkxGtTmvfQP+A/iuKqsUKwYz9Trszp2l2yFNFTvN0mPLVfmxV8RDQTHJJIErp4bB8JgCd2MJ5fZ3qyP3WXHy0dSTw6Nro3kuRZMXs+hC/0fzQNj6tuXpX3e66r/YbJNR4+JfnBhXO5PTSHeQrgS0= ARC-Authentication-Results: i=1; mx.zoho.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1556296973288806.6666621389886; Fri, 26 Apr 2019 09:42:53 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3uq-0008Df-2T; Fri, 26 Apr 2019 16:41:36 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3up-0008CT-0O for xen-devel@lists.xenproject.org; Fri, 26 Apr 2019 16:41:35 +0000 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 25c90e3d-6842-11e9-843c-bc764e045a96; Fri, 26 Apr 2019 16:41:32 +0000 (UTC) X-Inumbo-ID: 25c90e3d-6842-11e9-843c-bc764e045a96 X-IronPort-AV: E=Sophos;i="5.60,398,1549929600"; d="scan'208";a="84519725" From: Ian Jackson To: Date: Fri, 26 Apr 2019 17:39:57 +0100 Message-ID: <20190426164002.22381-11-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190426164002.22381-1-ian.jackson@eu.citrix.com> References: <20190426164002.22381-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 10/15] ts-kernel-build: Introduce cmd() 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: Ian Jackson Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Right now this is a simple wrapper around target_cmd_build. No functional change. Signed-off-by: Ian Jackson --- ts-kernel-build | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/ts-kernel-build b/ts-kernel-build index 3dad7d36..72ca98a1 100755 --- a/ts-kernel-build +++ b/ts-kernel-build @@ -48,6 +48,11 @@ my $parms =3D $archparms->{ $r{arch} }; =20 sub enable_xen_config (); =20 +sub cmd ($$) { + my ($timeout, $script) =3D @_; + target_cmd_build($ho, $timeout, $builddir, $script); +} + sub checkout () { return if $reuse; =20 @@ -58,7 +63,7 @@ sub checkout () { if (length($r{tree_pq_linux})) { build_clone($ho, 'pq_linux', $builddir, 'linux/.hg/patches'); =20 - target_cmd_build($ho, 1000, $builddir, <{DefConfig} ? $parms->{DefConfig}."_defconfig" : "defconfig"; - target_cmd_build($ho, 1000, $builddir, <&1 && touch ../build-ok-stamp) |tee= ../log test -f ../build-ok-stamp @@ -400,7 +405,7 @@ sub kinstall () { my $dtbs_install =3D ''; $dtbs_install =3D 'dtbs_install' if $parms->{Dtbs}; =20 - target_cmd_build($ho, 300, $builddir, < Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1556296976473172.91679772386544; Fri, 26 Apr 2019 09:42:56 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3ut-0008ID-Q0; Fri, 26 Apr 2019 16:41:39 +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.89) (envelope-from ) id 1hK3us-0008GY-NE for xen-devel@lists.xenproject.org; Fri, 26 Apr 2019 16:41:38 +0000 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 26c24244-6842-11e9-a407-8beefea5a8fc; Fri, 26 Apr 2019 16:41:34 +0000 (UTC) X-Inumbo-ID: 26c24244-6842-11e9-a407-8beefea5a8fc X-IronPort-AV: E=Sophos;i="5.60,398,1549929600"; d="scan'208";a="84519740" From: Ian Jackson To: Date: Fri, 26 Apr 2019 17:39:58 +0100 Message-ID: <20190426164002.22381-12-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190426164002.22381-1-ian.jackson@eu.citrix.com> References: <20190426164002.22381-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 11/15] cross builds: ts-kernel-build: Support cross target armhf 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: Julien Grall , Stefano Stabellini , Ian Jackson Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Signed-off-by: Ian Jackson CC: Julien Grall CC: Stefano Stabellini Acked-by: Julien Grall --- ts-kernel-build | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/ts-kernel-build b/ts-kernel-build index 72ca98a1..29c6c43d 100755 --- a/ts-kernel-build +++ b/ts-kernel-build @@ -21,6 +21,7 @@ BEGIN { unshift @INC, qw(.); } use Osstest; use Osstest::TestSupport; use Osstest::BuildSupport; +use Carp; =20 tsreadconfig(); =20 @@ -48,9 +49,24 @@ my $parms =3D $archparms->{ $r{arch} }; =20 sub enable_xen_config (); =20 +our $arch_envvars =3D ''; + sub cmd ($$) { my ($timeout, $script) =3D @_; - target_cmd_build($ho, $timeout, $builddir, $script); + target_cmd_build($ho, $timeout, $builddir, $arch_envvars.$script); +} + +sub checkarch () { + return if $r{arch} eq $ho->{Arch}; + my $cc =3D 'gcc'; + if ($r{arch} eq 'armhf') { + target_install_packages($ho, "crossbuild-essential-$r{arch}"); + $arch_envvars =3D < Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1556296976545370.6772379907569; Fri, 26 Apr 2019 09:42:56 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3ut-0008Hb-D2; Fri, 26 Apr 2019 16:41:39 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3us-0008G7-9V for xen-devel@lists.xenproject.org; Fri, 26 Apr 2019 16:41:38 +0000 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 28a4586c-6842-11e9-843c-bc764e045a96; Fri, 26 Apr 2019 16:41:37 +0000 (UTC) X-Inumbo-ID: 28a4586c-6842-11e9-843c-bc764e045a96 X-IronPort-AV: E=Sophos;i="5.60,398,1549929600"; d="scan'208";a="84519742" From: Ian Jackson To: Date: Fri, 26 Apr 2019 17:39:59 +0100 Message-ID: <20190426164002.22381-13-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190426164002.22381-1-ian.jackson@eu.citrix.com> References: <20190426164002.22381-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 12/15] cross builds: mfi-common: Break out set_build_hostflags 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: Ian Jackson Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" No functional change. Verified with standalone-generate-dump-flight-runvars. Signed-off-by: Ian Jackson --- mfi-common | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mfi-common b/mfi-common index f91156fe..dad03e39 100644 --- a/mfi-common +++ b/mfi-common @@ -216,6 +216,11 @@ create_xen_build_job () { $extra_runvars } =20 +set_build_hostflags () { + # set_build_hostflags HOST_ARCH + build_hostflags=3D"share-build-$suite-$1,arch-$1,suite-$suite,purpose-bu= ild" +} + create_build_jobs () { =20 local arch @@ -342,7 +347,7 @@ create_build_jobs () { arch_runvars=3D\"\$ARCH_RUNVARS_$arch\" " =20 - build_hostflags=3Dshare-build-$suite-$arch,arch-$arch,suite-$suite,pur= pose-build + set_build_hostflags $arch =20 for enable_xsm in $(xsm_variants $arch) ; do if [ x$enable_xsm =3D xtrue ] ; then --=20 2.11.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel From nobody Sun May 5 06:03:56 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1556296985; cv=none; d=zoho.com; s=zohoarc; b=kMjFGYbfraOOzLpsqo/BUmO0crLXwqqrgXYln2gGSSGuS47F865V2lAscOtAmGSk5ms39Vk1+HVdykaKwHSptvEPgVzFgAo2bQiOTzupMgcJz1Y1a+VZ21RMIotC7OzGwroVVROGzfBdpTz1gmLOpRQeeyaI/Jxj8zjKLpz2X5o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556296985; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=gR73GPxFEQ3uYULwodROF8e1i8llYnMEbntPfnF+n7M=; b=P+5+cb4YhdUacqEoedb7z0pgkVbcDRAO/ujIak2Qsqh2aNASEOJRqbENpqst2l4jYK07DXLkweBH/BAUbYw6N/8B9JQYR2U6KgEvEQx6Vd7BFlcj5dZVGOY8h+ywDbJ1Sh/q8TXNMyEhoNvPRcRIwZal0qJ1rUh/E6aGUBMDeDY= ARC-Authentication-Results: i=1; mx.zoho.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1556296985563804.2131684826024; Fri, 26 Apr 2019 09:43:05 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3v1-0008RJ-AD; Fri, 26 Apr 2019 16:41: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.89) (envelope-from ) id 1hK3uz-0008Pa-Up for xen-devel@lists.xenproject.org; Fri, 26 Apr 2019 16:41:45 +0000 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 2bdee566-6842-11e9-916f-1b696d25bbd7; Fri, 26 Apr 2019 16:41:42 +0000 (UTC) X-Inumbo-ID: 2bdee566-6842-11e9-916f-1b696d25bbd7 X-IronPort-AV: E=Sophos;i="5.60,398,1549929600"; d="scan'208";a="84519759" From: Ian Jackson To: Date: Fri, 26 Apr 2019 17:40:00 +0100 Message-ID: <20190426164002.22381-14-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190426164002.22381-1-ian.jackson@eu.citrix.com> References: <20190426164002.22381-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 13/15] cross builds: mfi-common: Prepare for kernel cross building 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: Ian Jackson Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Introduce job_create_build_crossable, which takes a target->host architecture map in its arguments, and use it for build-kern, passing an empty architecture map. Overall functional change is only to add host_arch=3D$arch to the kernel build jobs, which has no ultimate effect because it's the same as the arch=3D$arch. (Difference in flight construction verified with standalone-generate-dump-flight-runvars.) Signed-off-by: Ian Jackson --- mfi-common | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/mfi-common b/mfi-common index dad03e39..7b5c894f 100644 --- a/mfi-common +++ b/mfi-common @@ -216,6 +216,32 @@ create_xen_build_job () { $extra_runvars } =20 +job_create_build_crossable () { + # job_create_build_crossable \ + # JOBNAME RECIPE ARCH \ + # [TARGARCH1 HOSTARCH1 [TARGARCH2 HOSTARCH2 ...]]] - \ + # [RUNVAR1 [RUNVAR2 ...]] + local name=3D$1; shift + local recipe=3D$1; shift + local arch=3D$1; shift + local match_arch=3D$arch + local host_arch=3D$arch + while true; do + local t_targarch=3D$1; shift; if [ x$t_targarch =3D x- ]; then break;= fi + local t_hostarch=3D$1; shift + if [ x$match_arch =3D x$t_targarch ]; then + host_arch=3D$t_hostarch + match_arch=3DX # prevents us mapping again, which would be a bit m= ad + fi + done + local build_hostflags + set_build_hostflags $host_arch + job_create_build $name $recipe \ + arch=3D$arch host_arch=3D$host_arch \ + host_hostflags=3D$build_hostflags \ + "$@" +} + set_build_hostflags () { # set_build_hostflags HOST_ARCH build_hostflags=3D"share-build-$suite-$1,arch-$1,suite-$suite,purpose-bu= ild" @@ -397,11 +423,11 @@ create_build_jobs () { revision_qemuu=3D$REVISION_QEMU_UPSTREAM fi =20 - job_create_build build-$arch-pvops build-kern = \ - arch=3D$arch kconfighow=3Dxen-enable-xen-config = \ + job_create_build_crossable build-$arch-pvops build-kern $arch = \ + - = \ + kconfighow=3Dxen-enable-xen-config = \ $RUNVARS $BUILD_RUNVARS $BUILD_LINUX_RUNVARS $arch_runvars= \ $hostos_runvars = \ - host_hostflags=3D$build_hostflags = \ $pvops_kernel $pvops_kconfig_overrides = \ ${TREEVCS_LINUX:+treevcs_linux=3D}${TREEVCS_LINUX} = \ tree_linuxfirmware=3D$TREE_LINUXFIRMWARE = \ --=20 2.11.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel From nobody Sun May 5 06:03:56 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1556296988; cv=none; d=zoho.com; s=zohoarc; b=fClcCqjGAiQtqxx6TrSX8+dPsHJWHJ4AREf4YOynI8UgCnKrpfxFrHX4EG3M7xfS9NwEOOI+QJNHx1nHwIYkYR0D0kSEdoKhhiPWZN2zCBw+Ak9yPIKHChJ/aIqc48/mbyrmVj+v065sPXu72bJHS+Wjx7lT0NoQuC5rAkUlNWU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556296988; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=0EowLQbpTrZGhGJTe50T9JXV3Q61yT506aV7y/eapdk=; b=lSNeS9b9sNShUC3ktvdr1k1uIbGOXkniwgWfNN0UvJqUZ2p4/hALcl1zhjeTePKRrczl9Gvp+IIgnZlWGhJY8qVOXJbwrG7pASudm4GQCfbJ9up80hULemWlVLEwltfHf7kqIq96lY4ScylqlG8nEl+bqpvPZwhYuzynPX2JxHQ= ARC-Authentication-Results: i=1; mx.zoho.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1556296988745915.812071555626; Fri, 26 Apr 2019 09:43:08 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3v5-0008WJ-LU; Fri, 26 Apr 2019 16:41:51 +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.89) (envelope-from ) id 1hK3v4-0008Ug-6d for xen-devel@lists.xenproject.org; Fri, 26 Apr 2019 16:41:50 +0000 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 2f03bac8-6842-11e9-9eaf-070597e24fe2; Fri, 26 Apr 2019 16:41:47 +0000 (UTC) X-Inumbo-ID: 2f03bac8-6842-11e9-9eaf-070597e24fe2 X-IronPort-AV: E=Sophos;i="5.60,398,1549929600"; d="scan'208";a="84519767" From: Ian Jackson To: Date: Fri, 26 Apr 2019 17:40:01 +0100 Message-ID: <20190426164002.22381-15-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190426164002.22381-1-ian.jackson@eu.citrix.com> References: <20190426164002.22381-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 14/15] cross builds: Build armhf kernels on amd64 hosts 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: Julien Grall , Stefano Stabellini , Ian Jackson Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Our armhf hosts are devboards and very slow, as well as scarce. It 5takes 17ks or so for a kernel build. This will go *much* faster on an amd64 box and we have lots of those too. standalone-generate-dump-flight-runvars shows that the only change is to change host_arch from armhf to amd64 in build-armhf-pvops jobs. Signed-off-by: Ian Jackson CC: Julien Grall CC: Stefano Stabellini Acked-by: Julien Grall --- mfi-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mfi-common b/mfi-common index 7b5c894f..30f2692d 100644 --- a/mfi-common +++ b/mfi-common @@ -424,7 +424,7 @@ create_build_jobs () { fi =20 job_create_build_crossable build-$arch-pvops build-kern $arch = \ - - = \ + armhf amd64 - = \ kconfighow=3Dxen-enable-xen-config = \ $RUNVARS $BUILD_RUNVARS $BUILD_LINUX_RUNVARS $arch_runvars= \ $hostos_runvars = \ --=20 2.11.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel From nobody Sun May 5 06:03:56 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1556296960; cv=none; d=zoho.com; s=zohoarc; b=ilGb9Wwj8L23hryR7sLjSfz7cv+HJtzt98M0w3mKXMhW9hIk497+YkOwvLgoAdk0B0gYQX3VWyW4V26ChrpK8qqpnOLxv15yOJeA0lf5fPxLZQO80Md2+5hrwplgzpJtzT1tFDuBLMFMPg/h6DKaJzQivzWId5OHpmY01dJqbEI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556296960; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=WPAzjQsHzqTmftjRE/tRWFdsTNn6ytXPFuLINNW/8Yc=; b=MvMmBH0PQL1nyj44cFJQsiCGhkQiI4h9hyLDbxw1kVbD/4KgjlrJAGwK6nCYaZunpGbyZXMw9Hsfd4ttoC27mb2JDFQMykYU1U8RxWxOz1gwtHlJsE/+cyjtFoYpwNE6aj1MzWEECQXoeT28I4kYRp9SFNTtX000dDryl7urlMk= ARC-Authentication-Results: i=1; mx.zoho.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1556296960673253.89855854691302; Fri, 26 Apr 2019 09:42:40 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hK3vA-00009h-2c; Fri, 26 Apr 2019 16:41:56 +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.89) (envelope-from ) id 1hK3v8-00007s-Dt for xen-devel@lists.xenproject.org; Fri, 26 Apr 2019 16:41:54 +0000 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 322a8b0a-6842-11e9-9f0a-23698108754f; Fri, 26 Apr 2019 16:41:53 +0000 (UTC) X-Inumbo-ID: 322a8b0a-6842-11e9-9f0a-23698108754f X-IronPort-AV: E=Sophos;i="5.60,398,1549929600"; d="scan'208";a="84519775" From: Ian Jackson To: Date: Fri, 26 Apr 2019 17:40:02 +0100 Message-ID: <20190426164002.22381-16-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190426164002.22381-1-ian.jackson@eu.citrix.com> References: <20190426164002.22381-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH 15/15] ts-kernel-build: Move main program to bottom of script 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: Ian Jackson Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Having it in the middle makes it quite hard to find ! No functional change. Signed-off-by: Ian Jackson --- ts-kernel-build | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/ts-kernel-build b/ts-kernel-build index 29c6c43d..b9ba9ef5 100755 --- a/ts-kernel-build +++ b/ts-kernel-build @@ -466,20 +466,6 @@ sub fwinstall () { END } =20 -checkarch(); -checkout(); -config(); -build(); -kinstall(); -if ($r{tree_linuxfirmware}) { - fwbuild(); - fwinstall(); -} -built_stash($ho, $builddir, 'dist', 'kerndist'); -built_stash_debugfile($ho, $builddir, 'vmlinux', 'linux/vmlinux'); -built_compress_stashed('vmlinux'); -built_stash_debugfile($ho, $builddir, 'config', 'linux/.config'); - sub enable_xen_config () { return <<'END'; #!/bin/sh @@ -633,3 +619,17 @@ setopt CONFIG_TEGRA_HOST1X n exit 0 END } + +checkarch(); +checkout(); +config(); +build(); +kinstall(); +if ($r{tree_linuxfirmware}) { + fwbuild(); + fwinstall(); +} +built_stash($ho, $builddir, 'dist', 'kerndist'); +built_stash_debugfile($ho, $builddir, 'vmlinux', 'linux/vmlinux'); +built_compress_stashed('vmlinux'); +built_stash_debugfile($ho, $builddir, 'config', 'linux/.config'); --=20 2.11.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel