From nobody Fri May 3 12:02:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1635354233; cv=none; d=zohomail.com; s=zohoarc; b=RNOHcZ3TjwOMhj62170s/nqe2XZvs7enNuQrumD4MKr45+LgYYt+HgABu7JhvAUeQawdascMVTxj9cvKwlazK1gUPDrvQwcjDR/AmcPAtkFSrnWmaqX4ueYtQTHXHnv9JLXLUHGAay+lRsrUccXBC+lG9s2HDSsjfVBZb+B/+gY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635354233; h=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; bh=aV0xoRJrzvDBM4vBQY4k8X980Lt0ARIHFyS24ypIT/o=; b=l6k5AgR2fL2ZAeY+rqKqONIUzTme0t+fbGAgPcnsJ+v4VNrf4EytQ9riiapE2bqWvFxCXvuJnsYJX4K3moJD1CGS7uqWs3s7XvVAgtswVnYlphAX0iMSaWVMLDCEL4GDrfYRm4QwaB1ReKSqy8E8RVrYZy/OKps9Pdo82/oRVDM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1635354233573148.52491988881627; Wed, 27 Oct 2021 10:03:53 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.217118.376980 (Exim 4.92) (envelope-from ) id 1mfmKd-0004YO-8S; Wed, 27 Oct 2021 17:03:19 +0000 Received: by outflank-mailman (output) from mailman id 217118.376980; Wed, 27 Oct 2021 17:03:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mfmKd-0004XK-1B; Wed, 27 Oct 2021 17:03:19 +0000 Received: by outflank-mailman (input) for mailman id 217118; Wed, 27 Oct 2021 17:03:17 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mfmKb-0004Tv-Fd for xen-devel@lists.xenproject.org; Wed, 27 Oct 2021 17:03:17 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mfmKb-00007K-Eq for xen-devel@lists.xenproject.org; Wed, 27 Oct 2021 17:03:17 +0000 Received: from iwj (helo=mariner.uk.xensource.com) by xenbits.xenproject.org with local-bsmtp (Exim 4.92) (envelope-from ) id 1mfmKb-00008d-DO for xen-devel@lists.xenproject.org; Wed, 27 Oct 2021 17:03:17 +0000 Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by mariner.uk.xensource.com with esmtp (Exim 4.89) (envelope-from ) id 1mfmKP-0007y4-MO; Wed, 27 Oct 2021 18:03:05 +0100 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=aV0xoRJrzvDBM4vBQY4k8X980Lt0ARIHFyS24ypIT/o=; b=gbtSh3DWra8q9KhmBva49ms8mw UcCVBcn717j3sVsIheBdSAaUDC00u9qtBU1RIOyGtPq4EzJZI92XOvBITlaZAekvkCZ/5IC57gx09 eRDP7R3Dtyd8JZzcHymytuAaBHWPWwcSpKpmb/1j/2mGFtMzJW7UWFHWaJtZLNugGljc=; From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson , Juergen Gross Subject: [OSSTEST PATCH 1/2] ts-xen-build: Refactor enable/disable configure options Date: Wed, 27 Oct 2021 18:02:55 +0100 Message-Id: <20211027170256.18223-2-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211027170256.18223-1-iwj@xenproject.org> References: <20211027170256.18223-1-iwj@xenproject.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @xenproject.org) X-ZM-MESSAGEID: 1635354234933100005 Content-Type: text/plain; charset="utf-8" Replace the repeated pattern with a function to generate that code. No significant functional change. Signed-off-by: Ian Jackson CC: Juergen Gross Reviewed-by: Juergen Gross --- ts-xen-build | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/ts-xen-build b/ts-xen-build index ccb2aba23..d6f6bfacb 100755 --- a/ts-xen-build +++ b/ts-xen-build @@ -142,9 +142,21 @@ END } =20 sub build () { - my $xend_opt=3D $r{enable_xend} =3D~ m/true/ ? "--enable-xend" : "--di= sable-xend"; - my $ovmf_opt=3D $r{enable_ovmf} =3D~ m/true/ ? "--enable-ovmf" : "--di= sable-ovmf"; - my $qemutrad_opt =3D $r{arch} =3D~ m/amd64|i386/ ? "--enable-qemu-trad= itional" : "--disable-qemu-traditional"; + my $enable_opts =3D ''; # shell script to set "enable_opts" shell var + my $enable_disable =3D sub { + my ($subdir, $feat, $enable) =3D @_; + my $opt =3D "--".($enable ? 'enable' : 'disable')."-$feat"; + $enable_opts .=3D <("tools/", "xend", $r{enable_xend} =3D~ m/true/); + $enable_disable->("tools/", "ovmf", $r{enable_ovmf} =3D~ m/true/); + $enable_disable->("tools/", "qemu-traditional", $r{arch} =3D~ m/amd64|= i386/); =20 my $configure_prefix =3D $r{cmdprefix_configure} // ''; my $configure_suffix =3D $r{cmdsuffix_configure} // ''; @@ -152,17 +164,9 @@ sub build () { =20 buildcmd_stamped_logged(600, 'xen', 'configure', < (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1635354232409532.8283456109958; Wed, 27 Oct 2021 10:03:52 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.217120.376984 (Exim 4.92) (envelope-from ) id 1mfmKd-0004e8-Hn; Wed, 27 Oct 2021 17:03:19 +0000 Received: by outflank-mailman (output) from mailman id 217120.376984; Wed, 27 Oct 2021 17:03:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mfmKd-0004cK-Al; Wed, 27 Oct 2021 17:03:19 +0000 Received: by outflank-mailman (input) for mailman id 217120; Wed, 27 Oct 2021 17:03:17 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mfmKb-0004U9-Pz for xen-devel@lists.xenproject.org; Wed, 27 Oct 2021 17:03:17 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mfmKb-00007P-P9 for xen-devel@lists.xenproject.org; Wed, 27 Oct 2021 17:03:17 +0000 Received: from iwj (helo=mariner.uk.xensource.com) by xenbits.xenproject.org with local-bsmtp (Exim 4.92) (envelope-from ) id 1mfmKb-00008z-OU for xen-devel@lists.xenproject.org; Wed, 27 Oct 2021 17:03:17 +0000 Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by mariner.uk.xensource.com with esmtp (Exim 4.89) (envelope-from ) id 1mfmKQ-0007y4-1y; Wed, 27 Oct 2021 18:03:06 +0100 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=CmW5peRN50Em71b3k175/7jXqoQ/j3qYsI/MZ7encfA=; b=Hw7bbjgBaL5JaLH2jWoVtU43fJ zzkGW9yChBzMMC8S3zNosyOqb47qLK5srXP73qL9bhQ0ExLdhTwdp87iE7/BBn7VB9HACZhEIU0/W UJ+bezMvuxmegwm2IIPkqkNNUsL5f+IHIra8SUE9MinGjeboGeyF7jQWIKaR7yfYxchY=; From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson , Juergen Gross Subject: [OSSTEST PATCH 2/2] ts-xen-build: Pass --enable if --disable found in usage, and v.v. Date: Wed, 27 Oct 2021 18:02:56 +0100 Message-Id: <20211027170256.18223-3-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211027170256.18223-1-iwj@xenproject.org> References: <20211027170256.18223-1-iwj@xenproject.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @xenproject.org) X-ZM-MESSAGEID: 1635354233880100001 Content-Type: text/plain; charset="utf-8" The existing code works in practice if the usage message always lists the non-default, since the unlisted-in-usage options that would be supported, but are elided, are in any case the default. But configure might *compute* its defaults. In which case it will list only one of them in the usage message. If the computed default is not the same as the usual default (the one implied by listing the opposite in the usage message) we would wrongly not pass the option. So grep for both enable and disable. Signed-off-by: Ian Jackson CC: Juergen Gross Reviewed-by: Juergen Gross --- ts-xen-build | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ts-xen-build b/ts-xen-build index d6f6bfacb..c294a51ea 100755 --- a/ts-xen-build +++ b/ts-xen-build @@ -142,12 +142,20 @@ END } =20 sub build () { + # We want to explicitly enable and disable some things. But not + # all versions of Xen support all configuration options. We + # detect presence of an option by grepping configure. That finds + # them in the usage message. The usage message has only one of + # the two, depending on the usual default. (Presence of --enable + # in the usage output means --disable is supported, and vice + # versa.) So we search for both enable and disable, and if either + # is found, we use the one we want. my $enable_opts =3D ''; # shell script to set "enable_opts" shell var my $enable_disable =3D sub { my ($subdir, $feat, $enable) =3D @_; my $opt =3D "--".($enable ? 'enable' : 'disable')."-$feat"; $enable_opts .=3D <