From nobody Tue Apr 30 18:02:59 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=1556707804; cv=none; d=zoho.com; s=zohoarc; b=CcgwgDHgKE6Qdv90AjpXr6EatJHq+jyjg57tkmehflGjfSLKCKo5xGhDMg/fJMrUHTmyAv4FJTlI+9QFYqtXojm/JY2TYSVONBewYbw6xiOR7mWKus+jZEPT83pu+ulH2+CTKzYN0GLVbY0om47QTWe5gTeq+VfIpkI1oWbpFmY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556707804; 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=FqwYcqk+5tay8D9IN0Lr31YbB+KzRXsdimGWh68BXkM=; b=XLmYmYqQ5WfAJNJYbvnAkUzoHDTEr6rbA7F671aGCwcP2/ho7MNcyyX2u52cFeJkJPKzRM3E8PVaLGP7U/6S3dbngfeqeLwLAFpQeZf1gmb/8XAP8erdqHsLZAf5S5yIsf5WoaVkHnRt4aE+gr0san+60R82xZII+5TTImRLIgw= 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 1556707804804104.2085560612253; Wed, 1 May 2019 03:50:04 -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 1hLmn9-0005U0-3u; Wed, 01 May 2019 10:48: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 1hLmn8-0005Tv-Fx for xen-devel@lists.xenproject.org; Wed, 01 May 2019 10:48:46 +0000 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id b06460bc-6bfe-11e9-99d1-c720d7ab12f0; Wed, 01 May 2019 10:48:44 +0000 (UTC) X-Inumbo-ID: b06460bc-6bfe-11e9-99d1-c720d7ab12f0 X-IronPort-AV: E=Sophos;i="5.60,417,1549929600"; d="scan'208";a="84837291" From: Ian Jackson To: Date: Wed, 1 May 2019 11:48:25 +0100 Message-ID: <20190501104839.21621-2-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190501104839.21621-1-ian.jackson@eu.citrix.com> References: <20190501104839.21621-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH v2 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 8e20244d..f357434f 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -2485,10 +2485,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 Tue Apr 30 18:02:59 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=1556707803; cv=none; d=zoho.com; s=zohoarc; b=YdcWuCJV7/JQ1irC4rX+72xT29oq5l4+depYSOr7rP7Llj/BI7dbn3sfqkKdAIh/X3zKHcUAwclcxDMfH/BMguBvtcsSIcsfWfcjM1vcH0DRiVA8LJyr3a1v/+l2HkiAXDl2r9QEwK6utCIwwNhFcf82eT2xdHxkYkCVjEKXEV4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556707803; 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=8AjbRvGPiI0UJ4L1ZYn5tHOxGuXiI8T4t5QokySRcpw=; b=b1zXO1oVMEENhnyoT6JXx1zjVJILBpI3hQOTLAnLt6RKNtyB0yTuUkUZ8gF5CVIdKReYq73RsW2Lq8qnZWIrwUn0cfFEJUdfknFsXbFRxY74KWlR12LAP03thelfzvGPx48iS/BHCFQpFePYYk9sF4HAdr/8RT8NobgYj/hfWp0= 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 1556707803371469.71655802510725; Wed, 1 May 2019 03:50:03 -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 1hLmnB-0005UN-Ck; Wed, 01 May 2019 10:48:49 +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 1hLmnA-0005U6-Nf for xen-devel@lists.xenproject.org; Wed, 01 May 2019 10:48:48 +0000 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id b11b630c-6bfe-11e9-b2d5-2709518794a0; Wed, 01 May 2019 10:48:45 +0000 (UTC) X-Inumbo-ID: b11b630c-6bfe-11e9-b2d5-2709518794a0 X-IronPort-AV: E=Sophos;i="5.60,417,1549929600"; d="scan'208";a="84837292" From: Ian Jackson To: Date: Wed, 1 May 2019 11:48:26 +0100 Message-ID: <20190501104839.21621-3-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190501104839.21621-1-ian.jackson@eu.citrix.com> References: <20190501104839.21621-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH v2 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 f357434f..bb503559 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -2479,8 +2479,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 ($$) { @@ -2491,6 +2490,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 Tue Apr 30 18:02:59 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=1556707799; cv=none; d=zoho.com; s=zohoarc; b=SGkSOeLk7lqV8BmRxhic3ascrOHbPYjQlkebekuqQ+NFnVvV8Hm5onLbtkTPuxSBTWYVZo2hq9n2oHuKxNUx9aYdysdbfdrnLMZ2W65uuF6KZ+EGimRZBfoYUs4HmNI+uFStyI+85ZlFm3vV8OSPGGLg5G4raVzs7F8p6hqQ0Yc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556707799; 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=UUomlO173QrqdFAhCDXTVE3zWtemtiQqhqzAnAiBKbo+wIF+4gDml+xvKMSC1XYT8YM2OtErEEQ7zoumn+pLbPsyFADpPmez3+7WiaNXA8GLE4tptfR55eBgkuIUCGq3Yc/384q4G6n0LzCq9j0cVjp/UYWFYXwRzKLb2Hmh9CI= 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 1556707799382736.0141912481921; Wed, 1 May 2019 03:49:59 -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 1hLmnB-0005Ui-Vh; Wed, 01 May 2019 10:48:49 +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 1hLmnA-0005U8-OP for xen-devel@lists.xenproject.org; Wed, 01 May 2019 10:48:48 +0000 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id b1aa9400-6bfe-11e9-abce-478f4e94a758; Wed, 01 May 2019 10:48:45 +0000 (UTC) X-Inumbo-ID: b1aa9400-6bfe-11e9-abce-478f4e94a758 X-IronPort-AV: E=Sophos;i="5.60,417,1549929600"; d="scan'208";a="84837295" From: Ian Jackson To: Date: Wed, 1 May 2019 11:48:27 +0100 Message-ID: <20190501104839.21621-4-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190501104839.21621-1-ian.jackson@eu.citrix.com> References: <20190501104839.21621-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH v2 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 Tue Apr 30 18:02:59 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=1556707804; cv=none; d=zoho.com; s=zohoarc; b=l24I0h/6YFxOyge+fBulMDi754v2sIVcKijm4OSy6+5fwA4O2hWfk7qMtCGuheG0P1oPvAEuIaDVG3ZPPJqliHQmvxmCak+ZSPQZ8Abw5/M+CX6K2zVpapH8I3e361QLmj01UxjcEF/5eIwK8e5TaX7kXHUGPvPDiJYrPvOMWNw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556707804; 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=arhVzPbp5TDin6oLXdD9aB28XLuSZKUWsLkdRCkwrhc=; b=kXgC5K9TXHw2aEFrao1sN/+adRmK2YRMGX+2y0hIyvCm5RN6OsN7M5YsJbuNL7+LoewXMNn8/Lii+p4qy7ei+DR55enb7YtAyAtmZ/iWLNEW6bfiWZW7doQ8GT9vZ5K5zZtT5k1CGrVTZczopx/4qmGw57dMNlMzs/vOCxnYD2c= 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 1556707804820568.8330584436271; Wed, 1 May 2019 03:50:04 -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 1hLmnB-0005UW-Mo; Wed, 01 May 2019 10:48:49 +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 1hLmnA-0005U7-O4 for xen-devel@lists.xenproject.org; Wed, 01 May 2019 10:48:48 +0000 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id b1b58086-6bfe-11e9-978a-cbcacb3986cf; Wed, 01 May 2019 10:48:46 +0000 (UTC) X-Inumbo-ID: b1b58086-6bfe-11e9-978a-cbcacb3986cf X-IronPort-AV: E=Sophos;i="5.60,417,1549929600"; d="scan'208";a="84837298" From: Ian Jackson To: Date: Wed, 1 May 2019 11:48:28 +0100 Message-ID: <20190501104839.21621-5-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190501104839.21621-1-ian.jackson@eu.citrix.com> References: <20190501104839.21621-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH v2 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 --- v2: Correctly set $gho->{Arch} in selectguest, not $ho->{Arch} --- Osstest/TestSupport.pm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index bb503559..18566d32 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -1178,6 +1178,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") @@ -1809,6 +1810,7 @@ sub selectguest ($$) { Host =3D> $ho, Suite =3D> $r{"${gn}_suite"}, }; + $gho->{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 Tue Apr 30 18:02:59 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=1556707804; cv=none; d=zoho.com; s=zohoarc; b=loJy6OQoDbrfeAzX08BykMUF+GUYlSfUJJEBpRwwKCPTiZO0u3ksm1K5jZ5N0ZkbcHEya5d0sTvFdzKfA/OMMY1ldQcbGYZopQsG2g/upYWDyEa0DWvSoLwB1igNtbOeDxNnjPUJ++0iIZHcDbQ8ycThDVx9nc9Kbi/bcT96RNA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556707804; 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=F5EbZRdNiMviedpm1M7aUdnSfZBvOepVSeYeubnGRpa0UDlnvz5KNgjQtx06kpVWif6KND8brdfXRH5FvKFBgXaeWbx9kvmTdM396v9u4X+JXGXOz5HiySMcB13GpydUeA1DSQi7aDbWGQwCFVSIM+AjoSckGYHXp0BA/AWDZfI= 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 1556707804280401.9369889574069; Wed, 1 May 2019 03:50:04 -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 1hLmnM-0005hp-OX; Wed, 01 May 2019 10:49:00 +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 1hLmnL-0005gL-Jg for xen-devel@lists.xenproject.org; Wed, 01 May 2019 10:48:59 +0000 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id b7387bb2-6bfe-11e9-b2ec-ef05a20ef145; Wed, 01 May 2019 10:48:55 +0000 (UTC) X-Inumbo-ID: b7387bb2-6bfe-11e9-b2ec-ef05a20ef145 X-IronPort-AV: E=Sophos;i="5.60,417,1549929600"; d="scan'208";a="84837311" From: Ian Jackson To: Date: Wed, 1 May 2019 11:48:29 +0100 Message-ID: <20190501104839.21621-6-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190501104839.21621-1-ian.jackson@eu.citrix.com> References: <20190501104839.21621-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH v2 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 Tue Apr 30 18:02:59 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=1556707802; cv=none; d=zoho.com; s=zohoarc; b=VdT1OK1g/kb+H/kR64wWyCJSUsF/KorX9nIwQm9y1H9BrgQOngoi6zlA0w+5t299ydO6xXt+RoG37hcgJdzAXivBMwSDjFwiLD8IVeqyuy6w9pqhwEeZB3byQOIq6iT4Ok/+BgaQ7xQZM+ygQLKiWf7TnQ1OT9KIo+AYvMXZhOY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556707802; 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=BJE61l64eHQy/LJLr7x55HEKjMK2/ESWm/tdImUff42iPFcb0cC+7e2065ecTNOi2DnDgccbuwSoRC9M1LCaVNZdubqLQPSdRHmrLKjfPxPAwIbaPhBII1YoMCNGH2zGTk+EbBUTHlj/z/M9jyCLqoh2/+pZlIU5l5a0oH1LWM4= 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 1556707802607800.1612078787697; Wed, 1 May 2019 03:50:02 -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 1hLmnD-0005Vm-8u; Wed, 01 May 2019 10:48: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 1hLmnB-0005Ud-Vm for xen-devel@lists.xenproject.org; Wed, 01 May 2019 10:48:50 +0000 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id b2e7e4ee-6bfe-11e9-ba85-b72dd93ff4bf; Wed, 01 May 2019 10:48:48 +0000 (UTC) X-Inumbo-ID: b2e7e4ee-6bfe-11e9-ba85-b72dd93ff4bf X-IronPort-AV: E=Sophos;i="5.60,417,1549929600"; d="scan'208";a="84837301" From: Ian Jackson To: Date: Wed, 1 May 2019 11:48:30 +0100 Message-ID: <20190501104839.21621-7-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190501104839.21621-1-ian.jackson@eu.citrix.com> References: <20190501104839.21621-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH v2 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 Tue Apr 30 18:02:59 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=1556707809; cv=none; d=zoho.com; s=zohoarc; b=Yqe1ee4FLByVBHqyefbnl78uFB2izec3jNxAFf2QbwtRUbR0U6gbK5ejX/XN8LEwjwvAx2QXFX5GGL5YPXyd7oLYWWt+S40b7NI2CFhc2oTzhPdxWKFh/0jzLEyz2o4cctwrrCJ7jRcoSVgr6ti5G7yv2CDnKmNs5cd9vPbWQck= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556707809; 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=LMT/YdGRaNu6/bfzTUNNBz40E/bIIguR/LL3zfwygJ8=; b=gfZmehkp/esPmBBTfFC0tGlaGr54pVcLbt+rLY+sxACW34zoMA35fQU3tOUPb6lWnJeauBMVzcUQhqaD6gO/Q731LMC49Se5alvuVbMHX2zeNepUYaHXPlQ47m1ldoZHZHC0QptZxYjfl3aWfiaAkXho5ZYuYv6++3ASBC66uZA= 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 155670780920879.21349932924409; Wed, 1 May 2019 03:50:09 -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 1hLmnG-0005YE-93; Wed, 01 May 2019 10:48:54 +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 1hLmnE-0005WT-GA for xen-devel@lists.xenproject.org; Wed, 01 May 2019 10:48:52 +0000 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id b2ea397e-6bfe-11e9-bf70-4f86bc047861; Wed, 01 May 2019 10:48:48 +0000 (UTC) X-Inumbo-ID: b2ea397e-6bfe-11e9-bf70-4f86bc047861 X-IronPort-AV: E=Sophos;i="5.60,417,1549929600"; d="scan'208";a="84837302" From: Ian Jackson To: Date: Wed, 1 May 2019 11:48:31 +0100 Message-ID: <20190501104839.21621-8-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190501104839.21621-1-ian.jackson@eu.citrix.com> References: <20190501104839.21621-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH v2 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 18566d32..d87b6c89 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -2918,8 +2918,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 Tue Apr 30 18:02:59 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=1556707811; cv=none; d=zoho.com; s=zohoarc; b=kQcOD0aRABw+isw5MBP96dMXBHH/7FK13AD5ZqbHzL0cOv45cCMgK/MNh+MtHTL/q7a0+fPwQ8+4H1GNWjbqd1rsUSHhScr8jqd6ASyfR4Y2l7e3YlWfP25AYa2ZXdDPksu/J6iX1ARoZ+ijqqQwbnUmMj/oAjWkjq7aUesHKCE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556707811; 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=BhoOM8yRw40JQa3pLfApcaQkKRtYHk3k8SjtrzDKLnlrwnk6+C08p8ikfklsMzMPTR/FgIKlJbDyFkQa3+mqJcXCkOlnW9zmr4TePO4G82nVfBp1pm0Xke7ZQu5+/2Ja5TLWt0yBkzC3KObD2vZkgLjiUk5LZOf0TAyP0pQ1SLE= 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 1556707811388164.12759599042204; Wed, 1 May 2019 03:50:11 -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 1hLmnE-0005Wc-KP; Wed, 01 May 2019 10:48:52 +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 1hLmnD-0005Vd-7S for xen-devel@lists.xenproject.org; Wed, 01 May 2019 10:48:51 +0000 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id b34fa282-6bfe-11e9-9f5e-1b07f8b49dba; Wed, 01 May 2019 10:48:48 +0000 (UTC) X-Inumbo-ID: b34fa282-6bfe-11e9-9f5e-1b07f8b49dba X-IronPort-AV: E=Sophos;i="5.60,417,1549929600"; d="scan'208";a="84837303" From: Ian Jackson To: Date: Wed, 1 May 2019 11:48:32 +0100 Message-ID: <20190501104839.21621-9-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190501104839.21621-1-ian.jackson@eu.citrix.com> References: <20190501104839.21621-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH v2 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 Tue Apr 30 18:02:59 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=1556707801; cv=none; d=zoho.com; s=zohoarc; b=KaJQsj6rijAywgSwBFN1DWG1WrXKUjMweMRbSVB4TLzVcvZkKRoXUAXLtGxYVXA7IO35gt8FvWDIAzskUynetgYLEOKlluaMXlqN9WxzJcinYkr47us/bUX4UrW0bzuoU0h2wEfvFvMmON/ddochhGPVb05jMEzIkHv/WYyedEc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556707801; 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=ABbuvKpvLfWJmRAIm2tZnO4sOU84Lu2KJZHYTEgFHFHTtqLhoX+VCxBcGJz5n6M1EnmBxjRP1wFn0Z05JamTaxEnL0uPvDheeayNbDGNv5D/5gImWyAwYdP+zwG4DfgWIY10xhBOHJjd8h5U/VcvRbJrfMY5S45deQ1NeaXjqTo= 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 1556707801732590.2038916604822; Wed, 1 May 2019 03:50:01 -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 1hLmnN-0005jn-KN; Wed, 01 May 2019 10:49:01 +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 1hLmnL-0005gK-JR for xen-devel@lists.xenproject.org; Wed, 01 May 2019 10:48:59 +0000 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id b80e44cc-6bfe-11e9-9a81-a3083ba4411b; Wed, 01 May 2019 10:48:56 +0000 (UTC) X-Inumbo-ID: b80e44cc-6bfe-11e9-9a81-a3083ba4411b X-IronPort-AV: E=Sophos;i="5.60,417,1549929600"; d="scan'208";a="84837312" From: Ian Jackson To: Date: Wed, 1 May 2019 11:48:33 +0100 Message-ID: <20190501104839.21621-10-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190501104839.21621-1-ian.jackson@eu.citrix.com> References: <20190501104839.21621-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH v2 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 Tue Apr 30 18:02:59 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=1556707800; cv=none; d=zoho.com; s=zohoarc; b=ARBaqR2E3sKyFkBAaXAwXMrM5gujj7BmNGen+FIGKVBI5e9yTiXFy0Fc7o948dBqbF2odd7KBIqakyLOZZ20bTPDxoD20k3wi8ONBF3brplWeY0vtcQ0/caVk6rXU3O2QiTQ1EOgGziQp/GgctxScxDdSrlbXDMfPagVmOHsEKo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556707800; 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=KWUI/Gl983zPqm43y5EKMoVkXG51FhgrTrLv8s2uRuZJpOv//9HTVvv9d+km+aIrsGrQeVWE23hsoPGxEZScPu4KKEnNUDvdopJuA1jR/iqtmgUHdlGReThvyCljb45BIgKQrlgUl4K5sEuX4kC6NA8C9zjcJQk8qVk2gszGL4U= 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 1556707800636859.6466792445777; Wed, 1 May 2019 03:50:00 -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 1hLmnE-0005XE-VI; Wed, 01 May 2019 10:48:52 +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 1hLmnD-0005Vc-7h for xen-devel@lists.xenproject.org; Wed, 01 May 2019 10:48:51 +0000 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id b3d55896-6bfe-11e9-b019-af55abf72e0d; Wed, 01 May 2019 10:48:49 +0000 (UTC) X-Inumbo-ID: b3d55896-6bfe-11e9-b019-af55abf72e0d X-IronPort-AV: E=Sophos;i="5.60,417,1549929600"; d="scan'208";a="84837304" From: Ian Jackson To: Date: Wed, 1 May 2019 11:48:34 +0100 Message-ID: <20190501104839.21621-11-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190501104839.21621-1-ian.jackson@eu.citrix.com> References: <20190501104839.21621-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH v2 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 1556707802206481.27128687700815; Wed, 1 May 2019 03:50:02 -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 1hLmnI-0005b9-72; Wed, 01 May 2019 10:48: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 1hLmnG-0005Yx-NM for xen-devel@lists.xenproject.org; Wed, 01 May 2019 10:48:54 +0000 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id b4bffa68-6bfe-11e9-98ed-5f79ff758e18; Wed, 01 May 2019 10:48:51 +0000 (UTC) X-Inumbo-ID: b4bffa68-6bfe-11e9-98ed-5f79ff758e18 X-IronPort-AV: E=Sophos;i="5.60,417,1549929600"; d="scan'208";a="84837305" From: Ian Jackson To: Date: Wed, 1 May 2019 11:48:35 +0100 Message-ID: <20190501104839.21621-12-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190501104839.21621-1-ian.jackson@eu.citrix.com> References: <20190501104839.21621-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH v2 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: 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 Acked-by: Julien Grall CC: Stefano Stabellini --- v2: Drop HOSTCC=3D setting --- ts-kernel-build | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/ts-kernel-build b/ts-kernel-build index 72ca98a1..71eda48d 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 1556707804806415.23824720303094; Wed, 1 May 2019 03:50:04 -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 1hLmnH-0005aJ-Ox; Wed, 01 May 2019 10:48:55 +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 1hLmnG-0005Yw-NO for xen-devel@lists.xenproject.org; Wed, 01 May 2019 10:48:54 +0000 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id b4c62424-6bfe-11e9-befc-57774e018db9; Wed, 01 May 2019 10:48:51 +0000 (UTC) X-Inumbo-ID: b4c62424-6bfe-11e9-befc-57774e018db9 X-IronPort-AV: E=Sophos;i="5.60,417,1549929600"; d="scan'208";a="84837306" From: Ian Jackson To: Date: Wed, 1 May 2019 11:48:36 +0100 Message-ID: <20190501104839.21621-13-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190501104839.21621-1-ian.jackson@eu.citrix.com> References: <20190501104839.21621-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH v2 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 Tue Apr 30 18:02:59 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=1556707810; cv=none; d=zoho.com; s=zohoarc; b=TdVYZB85V/u8tYlq9JIN+FsuNEDfCuXXsmjGdHgKloet0YZqCJh67FUNatkCYn4BNHG+UCKDsmxJqSF9Vg/OvKG/xppq4KRWtu5iUDK2WXu3VkVPkArTYnKNMDfmqqawqwd+86fWlYbSxxcv/TgDXpj1GdPuT5xn+d34jGnYFhI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556707810; 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=kZ4tz4quUxFh75wYaZX80KSlqpLv/ifyBFoMDSn1d7uz83ovKIlddBMywjO7xfwbUap15+1fPTZRxVhQZyfqxuZS+J5HTjolEZhFpj598RXYF+fTZVE2uCbFrQ29Po8J2F+dVuF2zSnPNXqANp5SR3LNRwPOWv6T5hTVVUP3oUU= 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 155670781069821.267215405568322; Wed, 1 May 2019 03:50:10 -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 1hLmnN-0005iW-2x; Wed, 01 May 2019 10:49:01 +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 1hLmnL-0005gN-Jk for xen-devel@lists.xenproject.org; Wed, 01 May 2019 10:48:59 +0000 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id b812a51c-6bfe-11e9-86f4-5b2dab8e37f8; Wed, 01 May 2019 10:48:56 +0000 (UTC) X-Inumbo-ID: b812a51c-6bfe-11e9-86f4-5b2dab8e37f8 X-IronPort-AV: E=Sophos;i="5.60,417,1549929600"; d="scan'208";a="84837314" From: Ian Jackson To: Date: Wed, 1 May 2019 11:48:37 +0100 Message-ID: <20190501104839.21621-14-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190501104839.21621-1-ian.jackson@eu.citrix.com> References: <20190501104839.21621-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH v2 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 Tue Apr 30 18:02:59 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=1556707804; cv=none; d=zoho.com; s=zohoarc; b=haBBznVcoAMiFSzacmcZqNW+8XiAlZoxebj+JIP4zDPc3+KDKQUHHE2K1xIjkXXZgsP8gnyc6rZE3R85kju/KV4O5xhk1wPRJz7WIw6Fm4C5X6ud0+yt2HYYUcLV8kmfu624LfvxqmoQEQKXXiqoaDVhrvy81OUNSfZuC51A7hc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556707804; 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=ARuasKcVn+JPSO9OiLpUSxtjVVfGwCEXmabNlLkM34w=; b=f9ZevrRXby4vjkf+RmPthjiGsdPS8jkw23J14OkosjQ+W73NtpiQrzZwkRtMDYZQUTGLHdKnrzzdMddL/EjO3fvQCHBOCI7VuHYhtBLdc876gv6MMIyJdvZScWmA3G47/0wi5A3fRcSVPMa/yV13iRuP2NlLz+yYDIW7FVrIwQU= 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 155670780481289.20260724774494; Wed, 1 May 2019 03:50:04 -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 1hLmnI-0005bo-KH; Wed, 01 May 2019 10:48: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 1hLmnH-0005aP-Uu for xen-devel@lists.xenproject.org; Wed, 01 May 2019 10:48:55 +0000 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id b52f918e-6bfe-11e9-a79a-c70a89f204db; Wed, 01 May 2019 10:48:51 +0000 (UTC) X-Inumbo-ID: b52f918e-6bfe-11e9-a79a-c70a89f204db X-IronPort-AV: E=Sophos;i="5.60,417,1549929600"; d="scan'208";a="84837307" From: Ian Jackson To: Date: Wed, 1 May 2019 11:48:38 +0100 Message-ID: <20190501104839.21621-15-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190501104839.21621-1-ian.jackson@eu.citrix.com> References: <20190501104839.21621-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH v2 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: 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 takes 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: Stefano Stabellini Acked-by: Julien Grall --- v2: Fix typo in commit message. --- 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 Tue Apr 30 18:02:59 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=1556707807; cv=none; d=zoho.com; s=zohoarc; b=iz2JYskvM9tT0EsDPFEhGRsvX5n2bfSprMLYbXh7v+qpWBrY57rnLPRA++jMe0UvMSPEh9rmvW/MArn3UdgoUldkvba7ofJRMQrPH2rzhIpJq8h67bFNqrf2GzqfwkJlgxzQNSEZqCEbv93ik2tiZvLkoO/iQJPnFagBvR230sw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556707807; 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=8BfsQqmVeFNXYfRlFIWPzi4W/HGEyDEoU6UpvFqs4d4=; b=FVtElqvFME8gUa/OzboPfPOUnBd98k2k7xOQPlSxOpf7II7YgxGoqYecMMRaeljnNYDj0FY+u6W/jP52D9X7e/FGobTlT/CQsdqR6PAcwagtWCPomAJKdofmKloEgqR3GvhxsnzylaG5ipjVWfRQDPt2AYNVCwnhqwsQQg+wRNI= 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 1556707807852747.2345791120302; Wed, 1 May 2019 03:50:07 -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 1hLmnK-0005dr-1B; Wed, 01 May 2019 10:48:58 +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 1hLmnJ-0005cj-79 for xen-devel@lists.xenproject.org; Wed, 01 May 2019 10:48:57 +0000 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id b69a5220-6bfe-11e9-921d-bfeb0c51f066; Wed, 01 May 2019 10:48:54 +0000 (UTC) X-Inumbo-ID: b69a5220-6bfe-11e9-921d-bfeb0c51f066 X-IronPort-AV: E=Sophos;i="5.60,417,1549929600"; d="scan'208";a="84837308" From: Ian Jackson To: Date: Wed, 1 May 2019 11:48:39 +0100 Message-ID: <20190501104839.21621-16-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190501104839.21621-1-ian.jackson@eu.citrix.com> References: <20190501104839.21621-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [OSSTEST PATCH v2 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 71eda48d..f7d059b0 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