From patchwork Wed Sep 16 12:26:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 273563 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AAA37C43461 for ; Wed, 16 Sep 2020 12:28:12 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0048F206E6 for ; Wed, 16 Sep 2020 12:28:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="KjnfAnTD" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0048F206E6 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:56660 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kIWXi-0003gH-Tz for qemu-devel@archiver.kernel.org; Wed, 16 Sep 2020 08:28:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36622) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kIWWU-0002Ho-Es for qemu-devel@nongnu.org; Wed, 16 Sep 2020 08:26:54 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:37865) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kIWWS-00058w-NX for qemu-devel@nongnu.org; Wed, 16 Sep 2020 08:26:54 -0400 Received: by mail-wr1-x433.google.com with SMTP id z4so6733290wrr.4 for ; Wed, 16 Sep 2020 05:26:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8nU58X0zzaaWcyDZcOEKgi4a/LGSYI6Yhv+R+cwBRHY=; b=KjnfAnTD231rc79q8Rhs6Zt0DC9lJ3L+MkUjPYjiOgIUHkVsV+eC36s1SooEmZyalS 5XDsOhVuPtHPx/K8X9JOkroILp2n5SH/PWv3XBFq3YKnKUWveqmbv5zOM3sFgDQ5hdNw ghaB3di6pa7VpBZIZ/7czHCGn7JVDIurR99L8VAli7RoU8lv1hCRSJz6i/+TYa9QIJkA Ln3Tdp8brxQL9N7PcNcSSiPg8mUyJTie69HOMbVFRvXTidGB+LWc7368e03MUxxvvr4M C7OsIyHo6mx/Y1bes+fmUJbc7zqV80vEiVIs5wqA2QlwOkXaGcS4Ocvy3pquU3WfQIS4 dJmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8nU58X0zzaaWcyDZcOEKgi4a/LGSYI6Yhv+R+cwBRHY=; b=bW1mrAzcWmdtKGAIBy/Zy4VeIb5L1NxDwuScTjDDoD00sJSW1xtXFR3XbZRb74puxZ XhmKAEJc5hTxsPDcHDCQoxhkOfTaQYl6DFqS5EFRbWDdf0B1pr0myLWpODY7RrR6XOof 8glAd76W137DN0TosscxOCOuvz2pwe+7hNlSqWexIyeX0K7YMSoPle/Tr2dNFz5acZNX Wu4WUOiRu5+0edDlO3vphSjhhvyNVCtGdTQQGSkyATMK2trOqMlMYZoaNakS3aK65H/r Bj11mXLq5Y2AuPwjCqbGKTK8bm25d19a2W11umSIPmKCVM9qt2BbehbHiTkTXPi3eSS7 kLQw== X-Gm-Message-State: AOAM533Rh7q9nzZ1+cpECMeFfw2ywMBP9wt1cAONLxfDonW3F7RlNr9s QqaVphRuWM/u6NYhelDI150wq/pfftjkiw== X-Google-Smtp-Source: ABdhPJzyhcrE8OAxIZrYbE64qLwGY43/x7qy28RN6VZsNX3nbiwXvvDPg4ifZtP3MeB14eTUT+wfAQ== X-Received: by 2002:adf:e481:: with SMTP id i1mr26324512wrm.391.1600259211249; Wed, 16 Sep 2020 05:26:51 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q12sm31148471wrs.48.2020.09.16.05.26.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2020 05:26:49 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8DC921FF87; Wed, 16 Sep 2020 13:26:48 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 1/8] linux-user: test, don't assert addr != test in pgb_reserved_va Date: Wed, 16 Sep 2020 13:26:41 +0100 Message-Id: <20200916122648.17468-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200916122648.17468-1-alex.bennee@linaro.org> References: <20200916122648.17468-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x433.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , Bug 1895080 <1895080@bugs.launchpad.net>, =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Laurent Vivier Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On older kernels which don't implement MAP_FIXED_NOREPLACE the kernel may still fail to give us the address we asked for despite having already probed the map for a valid hole. Asserting isn't particularly useful to the user so let us move the check up and expand the error_report a little to give them a fighting chance of working around the problem. Signed-off-by: Alex Bennée Reviewed-by: Laurent Vivier Reviewed-by: Richard Henderson Cc: Bug 1895080 <1895080@bugs.launchpad.net> Ameliorates: ee94743034 Message-Id: <20200915134317.11110-2-alex.bennee@linaro.org> diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 4961e6119e24..f6022fd70493 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -2331,14 +2331,13 @@ static void pgb_reserved_va(const char *image_name, abi_ulong guest_loaddr, assert(guest_base != 0); test = g2h(0); addr = mmap(test, reserved_va, PROT_NONE, flags, -1, 0); - if (addr == MAP_FAILED) { + if (addr == MAP_FAILED || addr != test) { error_report("Unable to reserve 0x%lx bytes of virtual address " - "space (%s) for use as guest address space (check your " - "virtual memory ulimit setting or reserve less " - "using -R option)", reserved_va, strerror(errno)); + "space at %p (%s) for use as guest address space (check your" + "virtual memory ulimit setting, min_mmap_addr or reserve less " + "using -R option)", reserved_va, test, strerror(errno)); exit(EXIT_FAILURE); } - assert(addr == test); } void probe_guest_base(const char *image_name, abi_ulong guest_loaddr, From patchwork Wed Sep 16 12:26:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 305222 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DD4DCC43461 for ; Wed, 16 Sep 2020 12:35:00 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7AC732224F for ; Wed, 16 Sep 2020 12:35:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="MhddRTI7" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7AC732224F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:50578 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kIWeJ-0004eJ-9e for qemu-devel@archiver.kernel.org; Wed, 16 Sep 2020 08:34:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36662) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kIWWW-0002JT-Dk for qemu-devel@nongnu.org; Wed, 16 Sep 2020 08:26:56 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:54601) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kIWWU-000598-Qn for qemu-devel@nongnu.org; Wed, 16 Sep 2020 08:26:56 -0400 Received: by mail-wm1-x335.google.com with SMTP id s13so2581611wmh.4 for ; Wed, 16 Sep 2020 05:26:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=o+BmWQys2U5N6/XRUBJCW26L7A6dDeAULPOl97vv6H4=; b=MhddRTI7+azoCLnyzX+ujdxLfLpURrJ0F/5LI+hgVuE7/QeYhvmfKeYh73ucrNBJT7 r+tfmWmA0KX4fCG8/4nVEMDPGo+HbHPhAM6V15ZJemMELM2v1VFvtx7u6BSO7iJfqFrF EXWNLs95nDx8+oMnTDiMkJcMqfor5A1xwMWX3kMLObhGZXL2wVtbMfNp7nFDW9p79rMO vU0W4RL4UvisyfgRbENvhjbDIbGZBVtCvIh5+qU+g1W7MK59IzZ9HtsApgo11tPwXlKZ 0qNaTumffSeUZLxuOXGjke9n1JYGyHnsQnhKASNN7fZMRst3TwtzLA/L+dLDsScIqBBD NyFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=o+BmWQys2U5N6/XRUBJCW26L7A6dDeAULPOl97vv6H4=; b=jxaNIiytxJ39/CstT/aA/lv3r3iC6kWGWdtVgoJKLkN8uz/E9PDemz0Bw2jxEtHdSp x+OmbeCR15NgvTP6dwrv2aMTZ0gHlDFLsxAFI/QzvkNrP2yU1NXoKLxjk/vI1LvnjT2B +tpqxC63YZFw0LGNZ5pk5urFcKPypAYU3zA2NSJ5WWKBRXm7GPxw/gpEZn92LSx21LFS IeAomtw6jcikApwIexUaLmaVeBC1tT+qqT3Ik28Gs8HmQk+HDskNFWytvD3l2PVVrz7J hVR6npsL1f0iskH+cyavYkBE5kBLVmdKYDaBftq8cY8R21eT5bIPHBKbYKfo2GhY+SUp JCjQ== X-Gm-Message-State: AOAM532WmeKpwklXZ6OZn4ATPL+nWo8UtlDU3Gfh8RyPO9xRXuXFwGiW 0AHhNp9NGS2KG4GBioUC6J8OUw== X-Google-Smtp-Source: ABdhPJx9X5MpyMQxRmL3/f3WUQIBnSjCq3nTjlcKPiTraI8scdkXDNKv75aLdwkeUnayGyaadJX2DA== X-Received: by 2002:a7b:c749:: with SMTP id w9mr4214006wmk.29.1600259213370; Wed, 16 Sep 2020 05:26:53 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o4sm32958317wru.55.2020.09.16.05.26.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2020 05:26:49 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A29D21FF8C; Wed, 16 Sep 2020 13:26:48 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 2/8] iotests: Drop readlink -f Date: Wed, 16 Sep 2020 13:26:42 +0100 Message-Id: <20200916122648.17468-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200916122648.17468-1-alex.bennee@linaro.org> References: <20200916122648.17468-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x335.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Thomas Huth , "open list:Block layer core" , Richard Henderson , qemu-devel@nongnu.org, Max Reitz , Claudio Fontana , =?utf-8?q?Al?= =?utf-8?q?ex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Max Reitz On macOS, (out of the box) readlink does not have -f. We do not really need readlink here, though, it was just a replacement for realpath (which is not available on our BSD test systems), which we needed to make the $(dirname) into an absolute path. Instead of using either, just use "cd; pwd" like is done for $source_iotests. ("iotests: Allow running from different directory") Fixes: b1cbc33a3971b6bb005d5ac3569feae35a71de0f Reported-by: Claudio Fontana Reported-by: Thomas Huth Suggested-by: Peter Maydell Signed-off-by: Max Reitz Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20200914145606.94620-1-mreitz@redhat.com> Message-Id: <20200915134317.11110-3-alex.bennee@linaro.org> diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check index e14a1f354dd9..678b6e49103a 100755 --- a/tests/qemu-iotests/check +++ b/tests/qemu-iotests/check @@ -44,7 +44,7 @@ then _init_error "failed to obtain source tree name from check symlink" fi source_iotests=$(cd "$source_iotests"; pwd) || _init_error "failed to enter source tree" - build_iotests=$(readlink -f $(dirname "$0")) + build_iotests=$(cd "$(dirname "$0")"; pwd) else # called from the source tree source_iotests=$PWD From patchwork Wed Sep 16 12:26:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 273557 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4D6A3C433E2 for ; Wed, 16 Sep 2020 12:41:51 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CD84A22248 for ; Wed, 16 Sep 2020 12:41:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="rQYl/9GY" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CD84A22248 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:43998 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kIWkv-0005AR-TG for qemu-devel@archiver.kernel.org; Wed, 16 Sep 2020 08:41:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36672) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kIWWX-0002LI-I9 for qemu-devel@nongnu.org; Wed, 16 Sep 2020 08:26:57 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:41867) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kIWWV-00059M-Q1 for qemu-devel@nongnu.org; Wed, 16 Sep 2020 08:26:57 -0400 Received: by mail-wr1-x42a.google.com with SMTP id w5so6697267wrp.8 for ; Wed, 16 Sep 2020 05:26:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5iSSa42PazJoHEVNt7cs++ElcTxDkn7cDPvhYrmokYY=; b=rQYl/9GYYL2ulWNVIu+uhGHV3K1FZcHQJNKjpbsPQIhMybPfKJL1SCxSLKk7PBbQ/b jy/gkobYyHoc29dRW5qwVJ4cOeMDFZefeSKLN8hqUoMxbQHggcHwHnwP+3uHi9VyCxaY UlklLaUmIf+3WFUo1Fy8dAF2ZKf+greyrakBcxW7Ufz9GO8+eU8lz9+h9Zs7aIOHaaX5 o+1BSLTZoMciHZo9TRg56lmvYhIUn9n0cpMcqM7Guk1EwsQKb6WchkszHtPXn9/DzujX YGxWR4uN65Ze1P9AVQneMfsJ8mlBIKWZwjoCW9JIVvFHNR1BSxgfmWH8teIHWaGJoxKt am/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5iSSa42PazJoHEVNt7cs++ElcTxDkn7cDPvhYrmokYY=; b=X9cMD5+IWI24WNJ+jAGAtx8cD7wscBq2y1TBZ6SI7q5kStzMxjXACqyzcV0bfa8mnC Wlz/J+xtNDDikyPsJ5o6I/YTadNrdqJUEPP9bfgcZH5AC/C+o48iu59cN5fDtWJrGzN9 dxyM0nW2pvUUheD8jweI/YzM4EAmh3f8YJ9Na1pAKaypUo193qCIZKbg+aiPdjhfFo1a TtLgCp7CMuDwcanL9VUgtaYT/6ZfcITndvJ4bNjdvnlO4xUxJALUzhDn8yibmzaYbPCm hnEsPdxur4j/1ssyf5ZDzjSsk6ZidycYLmljODpHOcDscerXu27sqn8Fpr/c/Pen8KsQ b4cA== X-Gm-Message-State: AOAM531C3+yjvG7/wx8vJFQvL3FJiE5SNCFjo8Mibc7ptXSA6QyLewa3 6sga8avbvNOBqsotE9x8PsZdHA== X-Google-Smtp-Source: ABdhPJyi1lb9BucQK+YSGCgwjAE4v/wcMxWRzaFCiUjXcfLHqnTPGmu7sLGALTmBR1o0MLac7XzrUQ== X-Received: by 2002:adf:fd8c:: with SMTP id d12mr26315164wrr.283.1600259214510; Wed, 16 Sep 2020 05:26:54 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id i3sm32231510wrs.4.2020.09.16.05.26.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2020 05:26:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B7DEC1FF8F; Wed, 16 Sep 2020 13:26:48 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 3/8] configure: move deprecated feature processing to supported_target Date: Wed, 16 Sep 2020 13:26:43 +0100 Message-Id: <20200916122648.17468-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200916122648.17468-1-alex.bennee@linaro.org> References: <20200916122648.17468-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This is the common point at which we validate targets so it makes sense to add_to deprecated_features here. It will make future target deprecation easier as we only need to tweak one list. Signed-off-by: Alex Bennée Message-Id: <20200915134317.11110-4-alex.bennee@linaro.org> diff --git a/configure b/configure index ce27eafb0a9e..51d03a8d340f 100755 --- a/configure +++ b/configure @@ -280,6 +280,9 @@ supported_whpx_target() { return 1 } +deprecated_targets_list=ppc64abi32-linux-user +deprecated_features="" + supported_target() { case "$1" in *-softmmu) @@ -301,6 +304,12 @@ supported_target() { return 1 ;; esac + + # if a deprecated target is enabled we note it here + if echo "$deprecated_targets_list" | grep -q "$1"; then + add_to deprecated_features $1 + fi + test "$tcg" = "yes" && return 0 supported_kvm_target "$1" && return 0 supported_xen_target "$1" && return 0 @@ -542,8 +551,6 @@ gettext="" bogus_os="no" malloc_trim="" -deprecated_features="" - # parse CC options first for opt do optarg=$(expr "x$opt" : 'x[^=]*=\(.*\)') @@ -1724,7 +1731,7 @@ fi if test -z "$target_list_exclude" -a -z "$target_list"; then # if the user doesn't specify anything lets skip deprecating stuff - target_list_exclude=ppc64abi32-linux-user + target_list_exclude=$deprecated_targets_list fi exclude_list=$(echo "$target_list_exclude" | sed -e 's/,/ /g') @@ -7668,7 +7675,6 @@ case "$target_name" in TARGET_SYSTBL_ABI=common,nospu,32 echo "TARGET_ABI32=y" >> $config_target_mak gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml power-vsx.xml" - deprecated_features="ppc64abi32 ${deprecated_features}" ;; riscv32) TARGET_BASE_ARCH=riscv From patchwork Wed Sep 16 12:26:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 273562 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 75764C43461 for ; Wed, 16 Sep 2020 12:30:18 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 01CFF22225 for ; Wed, 16 Sep 2020 12:30:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="P9tOy0dn" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 01CFF22225 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:35680 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kIWZl-0006nH-2o for qemu-devel@archiver.kernel.org; Wed, 16 Sep 2020 08:30:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36696) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kIWWZ-0002N6-MC for qemu-devel@nongnu.org; Wed, 16 Sep 2020 08:26:59 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:44240) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kIWWX-00059a-Ve for qemu-devel@nongnu.org; Wed, 16 Sep 2020 08:26:59 -0400 Received: by mail-wr1-x42e.google.com with SMTP id s12so6671138wrw.11 for ; Wed, 16 Sep 2020 05:26:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ktsao0Yr9LA/9tEst7nosAjV8iuHgs9MeN8ofZc1GKU=; b=P9tOy0dn7xDs9MfiQW7s7b3wrLjqT+3Ud5cTYvd30dzRlalOyVzpoiOs/CaIWuhf5x xQrEdnGucV1Jc/uvze69pcaum8hjFJyX4r9rxGVGwGRth6Z2vNvN8+aOPtXTwMzEAIqY w36JsThHcKIzm/At8OeNxLmhedPckWdyQYWqNixTQA8pPKp6+Z1RI7bNaRB9OBR8XTsH 544e6Qf+C5/H1klGZtyjVENpUBqk9Qg7CrH0lnym/9sF1BKH48BjhTF45Gxv5xRbJfy6 2JgB3BZ/S99DjYSV4G2PPIQqHyyk7VP98tKV976bR0mtNxwpGEGMHNv8Gza7A611Kb3I pDzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ktsao0Yr9LA/9tEst7nosAjV8iuHgs9MeN8ofZc1GKU=; b=U0zM9Wo4oZzJCiy5hJzmOUwSY4lQPMEYwHRm+SfYtIgHci6nSNKYstlUkm8OMYAgGL UdhMUmIz47CpFoLwaXifcBZCFt+CuGgvZwk6sxOx7rgHxJuMFaYfpOZxIuQ1W74a99IA ksOWibAzVE5oH8AYzIDpdxHeI0ZPQb51adp9r2M17w+FeBPt0XZVCPoV1o6UI/H0t+XZ rmvjC+e41B/DB7TyUGxCi82isznDbsILfcDOrLeU2QxFH2HB6NFvuP/cxeVbQtvYNrSF g9gekoE273ubadM5PaHieescL8RJbF+Gi77PEvycSnR5DzdofF9U/RJTGfEH98I/IUHc JGWg== X-Gm-Message-State: AOAM530pyzJwXuB5s+Wg2sUrEOUkt7+Ib7AqlfOwfa8fZbzoX6AC/M8P MBrnBJnQtXwsSMWWPv9yk8DD0g== X-Google-Smtp-Source: ABdhPJwaIEKrjJmzFNEEHSIbceUtInRs5BcfPeqc52IiH1kqHCzcZJwXw333gQIHXQAXB7nKkBoTvw== X-Received: by 2002:adf:b74b:: with SMTP id n11mr868485wre.274.1600259216498; Wed, 16 Sep 2020 05:26:56 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u186sm4534115wmu.34.2020.09.16.05.26.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2020 05:26:53 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CE24C1FF90; Wed, 16 Sep 2020 13:26:48 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 4/8] configure: also skip deprecated targets with target-list-exclude Date: Wed, 16 Sep 2020 13:26:44 +0100 Message-Id: <20200916122648.17468-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200916122648.17468-1-alex.bennee@linaro.org> References: <20200916122648.17468-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42e.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Now the user has to make an even more deliberate decision to enable a deprecated target rather than getting it as a side effect of using --target-exclude-list. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20200915134317.11110-5-alex.bennee@linaro.org> diff --git a/configure b/configure index 51d03a8d340f..f5fe48d6dd7b 100755 --- a/configure +++ b/configure @@ -1729,9 +1729,14 @@ if [ "$bsd_user" = "yes" ]; then mak_wilds="${mak_wilds} $source_path/default-configs/*-bsd-user.mak" fi -if test -z "$target_list_exclude" -a -z "$target_list"; then - # if the user doesn't specify anything lets skip deprecating stuff - target_list_exclude=$deprecated_targets_list +# If the user doesn't explicitly specify a deprecated target we will +# skip it. +if test -z "$target_list"; then + if test -z "$target_list_exclude"; then + target_list_exclude="$deprecated_targets_list" + else + target_list_exclude="$target_list_exclude,$deprecated_targets_list" + fi fi exclude_list=$(echo "$target_list_exclude" | sed -e 's/,/ /g') From patchwork Wed Sep 16 12:26:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 305224 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A85A1C43461 for ; Wed, 16 Sep 2020 12:28:19 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 21A9A21D24 for ; Wed, 16 Sep 2020 12:28:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="k/KNwq6q" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 21A9A21D24 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:57372 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kIWXq-0003zL-2O for qemu-devel@archiver.kernel.org; Wed, 16 Sep 2020 08:28:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36700) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kIWWa-0002PC-Fn for qemu-devel@nongnu.org; Wed, 16 Sep 2020 08:27:00 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:42478) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kIWWY-00059h-V6 for qemu-devel@nongnu.org; Wed, 16 Sep 2020 08:27:00 -0400 Received: by mail-wr1-x42c.google.com with SMTP id c18so6687692wrm.9 for ; Wed, 16 Sep 2020 05:26:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HQrz0i+rDWZq2bY4Msh6O9mfJzIupW4z7nc0usXBlMM=; b=k/KNwq6qqJ8eqhK+/NIYt3rCfffaYaZsoBQcUVoyGor6pRyE+vWSbxLLeoPA3djjrO DIGXZzI0gFt9Q42v5faJ0crU2W5yBTezOLpE3EvJuWivH8on/y1lzJn0B1UfP99hY6E7 FVsz7/Rec88/LcVn9FS4MgbU7+nOGFvt/IEmIiLmvZBlGimDnoYLOgZ1TiIvreUYIF9R wANHNI1J31JoYUXLhy+1Y12Y7+dvf+T9Tg61P1nBUcbLi8Cn/NRbm0fwVnspLCLzIzPq OS9jOYIus2EPaSIn/CI/8pKasxZear2LOk+ztK7RMpINR7oad3GShicOWlsRserWqv4y L4lA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HQrz0i+rDWZq2bY4Msh6O9mfJzIupW4z7nc0usXBlMM=; b=gXs0bt1SdrsMAxlFRs5p4vnsDRHUsiazB0NzhnwD4zw7MHbCEURHTPwVhsTmNRVe2R rkOcMAghk/76aX+JiTYeJut7drMPA8C2qTkHa4AqqHA1WwAQfBpdEvR8/SvNt9pPRyW4 AyOoCAzK1u4BuqDmbctA8Nh2UrOb687z9eVzsJNRaqr/dGenXY+gYr/s6TXT/cwx5LNU lzxTOeZNWALxL9jMsd55PJxYkgRt/8JdGcTlw3Q0iWQ3VeePl8J1nfPf9GEu8Piah+UI bcRvdZ0nCr+kgfmSqaU7giJycvoOnnm/t94OUeliVoQ2Bkw9aB6lCa2XUwZXds1iLd6b 2e8g== X-Gm-Message-State: AOAM531O1f7hpHN/HEH/xI7YNVlKg+r4LfSoSJvrUdGtlbB+0l96CxYE ExVxv1T1tXr/mY+IIoStb60pxw== X-Google-Smtp-Source: ABdhPJwmtk5ykACihv/eRJRJHCyvtE/uKWs8i+JwBbrYs4l1pZuT2kPrWrNEi6QDbYx4dwHR42DD7Q== X-Received: by 2002:adf:f14f:: with SMTP id y15mr25638980wro.69.1600259217489; Wed, 16 Sep 2020 05:26:57 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id d18sm32903071wrm.10.2020.09.16.05.26.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2020 05:26:53 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E3CA31FF91; Wed, 16 Sep 2020 13:26:48 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 5/8] configure: clean-up the target-list-exclude logic Date: Wed, 16 Sep 2020 13:26:45 +0100 Message-Id: <20200916122648.17468-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200916122648.17468-1-alex.bennee@linaro.org> References: <20200916122648.17468-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42c.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Rather than sed and loop just do a grep. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20200915134317.11110-6-alex.bennee@linaro.org> diff --git a/configure b/configure index f5fe48d6dd7b..58be974065c8 100755 --- a/configure +++ b/configure @@ -1739,17 +1739,9 @@ if test -z "$target_list"; then fi fi -exclude_list=$(echo "$target_list_exclude" | sed -e 's/,/ /g') for config in $mak_wilds; do target="$(basename "$config" .mak)" - exclude="no" - for excl in $exclude_list; do - if test "$excl" = "$target"; then - exclude="yes" - break; - fi - done - if test "$exclude" = "no"; then + if echo "$target_list_exclude" | grep -vq "$target"; then default_target_list="${default_target_list} $target" fi done From patchwork Wed Sep 16 12:26:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 273559 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DECF3C43461 for ; Wed, 16 Sep 2020 12:37:11 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6090022225 for ; Wed, 16 Sep 2020 12:37:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="UuvY3Lgz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6090022225 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:56804 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kIWgQ-0007Fe-DG for qemu-devel@archiver.kernel.org; Wed, 16 Sep 2020 08:37:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36732) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kIWWg-0002Yf-1s for qemu-devel@nongnu.org; Wed, 16 Sep 2020 08:27:06 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:39180) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kIWWa-00059r-Qc for qemu-devel@nongnu.org; Wed, 16 Sep 2020 08:27:05 -0400 Received: by mail-wr1-x436.google.com with SMTP id a17so6713808wrn.6 for ; Wed, 16 Sep 2020 05:27:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tlWKWmJvleFe6NmAUM6zvE4yQ74zUWxKvHgBoaE7gkg=; b=UuvY3LgzA4JkbAlpECtwA1VNgNyY1hVmaX4FiaM+z8O54MISa+mFZHdEzm9CC8vFT9 Ooi73pU3FTfb8Uf7+QAqkcA9wy6UVvFb6zIqSFTJEEOTI3rEPMHyAO4lpxZNYqp97CxQ JI5tnq8P21fliGpl9hUOWSyeMziHfPGciQH0WIkVskHeRk4CoFet4HV3nWq+ZHXAdcu1 W6VKYT6WFfmUMfUvLk/I15JEOPWHO3emNsVcLWwVh9B3CZMJmyJSUncJcFbck96810zO 5WZ7Naaj5Va6KkTCgURwrCd+kpSUSgT9u6YTe5cHr7qK+DKjLmOyuo0m0zwPRIY/dFEG ry4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tlWKWmJvleFe6NmAUM6zvE4yQ74zUWxKvHgBoaE7gkg=; b=Bwe6G1/MGH+KJlN+NvqdU9Ehgmdg7NSeVi9V5StlJDhCrBnMzU15JtYgdupCp2Qo6e YxVISotPyuWMQutUR8JWLCcf1XXL1XZbrq5d6tqab8ie/TDduuJeQEUCY2VLrowlrKu/ 942fAlTaMR3dBnaNGDioQ1+3Rc8jHPG56pXrHgu4DddkjdeWGqmkus77V30FHNPaC8KB Fd3nLEzQX5e0DGX0UjbvhHriVI0WiwHde5W3TEdnxfaXqtVwuox9vlAw/aY1d6BvewW6 PcpRXIMcCSaZx9aubHZ8jWE0lU7OJ0gCm98CVyKWJ8aj4yG0J0JdeHGc6qNQW1hUzp/0 kOyA== X-Gm-Message-State: AOAM5325aPQ84UNBPQYFdn+qtzmxp16DiQsVtUDXiyjbYJzayUl8p1aI nw0VROnrqb8NSy2Ttx4ZMF16KQ== X-Google-Smtp-Source: ABdhPJxKhLIPGj3RKOhfLD7HAlO47tHDN4D861Wbbk2zuxWl8tyUFkQD7xkVFqjAoSAam2qfpb7rGQ== X-Received: by 2002:a5d:574a:: with SMTP id q10mr4227164wrw.127.1600259219490; Wed, 16 Sep 2020 05:26:59 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v2sm32290614wrm.16.2020.09.16.05.26.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2020 05:26:53 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 04C1D1FF92; Wed, 16 Sep 2020 13:26:49 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 6/8] configure: include tilegx-linux-user in the deprecation logic Date: Wed, 16 Sep 2020 13:26:46 +0100 Message-Id: <20200916122648.17468-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200916122648.17468-1-alex.bennee@linaro.org> References: <20200916122648.17468-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x436.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Ma?= =?utf-8?q?thieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The target is already marked as deprecated in the documentation. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20200915134317.11110-7-alex.bennee@linaro.org> diff --git a/configure b/configure index 58be974065c8..dfd7f18dcb24 100755 --- a/configure +++ b/configure @@ -280,7 +280,7 @@ supported_whpx_target() { return 1 } -deprecated_targets_list=ppc64abi32-linux-user +deprecated_targets_list=ppc64abi32-linux-user,tilegx-linux-user deprecated_features="" supported_target() { From patchwork Wed Sep 16 12:26:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 305223 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7DFA2C43461 for ; Wed, 16 Sep 2020 12:33:26 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B390F2224B for ; Wed, 16 Sep 2020 12:33:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="ii2MiOQU" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B390F2224B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:44098 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kIWcm-00023c-Hb for qemu-devel@archiver.kernel.org; Wed, 16 Sep 2020 08:33:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36756) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kIWWh-0002cl-HN for qemu-devel@nongnu.org; Wed, 16 Sep 2020 08:27:07 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:41868) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kIWWb-00059y-Ul for qemu-devel@nongnu.org; Wed, 16 Sep 2020 08:27:07 -0400 Received: by mail-wr1-x42a.google.com with SMTP id w5so6697571wrp.8 for ; Wed, 16 Sep 2020 05:27:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YcCcU9F2In+Ku3PtGwzsyh5JOTdQ6yu4YMUVutwWuck=; b=ii2MiOQUlGFLxyKKUOw3tsZocoUJLENNLohooeoFExeENzA0nw5L7y77aa4i5pIiHJ SKUhlNFeTY6+u7Yqdgn2L9mwvUg0DvGaGlmht+0dwQNAnTLZO9FXSpFUF1ljcL2UPrET PwjLg4L3oxU1Ij0rARPCdqGNdPE7BZBOvhpYNgw7DASqpRf2C4AJeQ8LbDR6uBvFWVFw rokfyhbcLyUDGwop1yl2fyz4x6O7ZQlMPFlMw5srPqYG8myWp9lzFkxydBKpWWrhzU0I Ux6bQfeeqenzHRiZQ0uiHkBGxDZEOum4MrA6ZRlVxvs4IDxxbCLfquGKR2hcG3Bv6HGb bWUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YcCcU9F2In+Ku3PtGwzsyh5JOTdQ6yu4YMUVutwWuck=; b=kV8UldBBWmXEqE1AYutLymek6Xq+j6TPnw20g81TrNlfsKoPQO7ZdtbAtHZ/2jeCKA 6BLmzZ3IcDeO1lArg3uUKRkiv4PmTbz/TC7eCAdNYnVhgdMhJhXaNpJ/i9vYV4he5Pd9 qChtVWIbtu6JrCH9Rim17FL4xsuzlvAFalqpEHvPDTTJjStrLGKl+3VUbWY77MS4bqif NtSlqMbNb+uqQ/RK6xDIaWRliqIvlRbiwzcBl9QXHUOrls26bDYDRoaxp9A9LM6+RePB utVpXFRofOnGldsEwb3fP4dJNK+ld2VOAhHqGmZpS52zhQ1woAXqXbUcnjaK/I38PQcV 93Cw== X-Gm-Message-State: AOAM531id2f76/ZXpdgs1Wj2C2Q750zeHGtGJX5stkX6Mdm3iEZHmFNg MY/RwsjrT5qk3tCE94KsWEX6ag== X-Google-Smtp-Source: ABdhPJxRCqw2W1AB2w0CyHv9x14MFwk0P/5BVq/QkqCyXCBD1nhgVu7Pfi5yVcx9XJxyNqdif5r0rg== X-Received: by 2002:a5d:4450:: with SMTP id x16mr25494168wrr.28.1600259220531; Wed, 16 Sep 2020 05:27:00 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id k5sm3434672wmb.19.2020.09.16.05.26.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2020 05:26:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1BBCF1FF93; Wed, 16 Sep 2020 13:26:49 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 7/8] gitlab: create a build-deprecated target Date: Wed, 16 Sep 2020 13:26:47 +0100 Message-Id: <20200916122648.17468-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200916122648.17468-1-alex.bennee@linaro.org> References: <20200916122648.17468-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Philippe?= =?utf-8?q?_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" These targets might be deprecated but we should keep them building before the final axe comes down. Lets keep them all in one place and don't hold up the CI if they do fail. They are either poorly tested or already flaky anyway. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Acked-by: Thomas Huth Message-Id: <20200915134317.11110-8-alex.bennee@linaro.org> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 72e8604579ee..f027b55aef15 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -254,6 +254,16 @@ build-clang: ppc-softmmu s390x-softmmu arm-linux-user MAKE_CHECK_ARGS: check +# These targets are on the way out +build-deprecated: + <<: *native_build_job_definition + variables: + IMAGE: debian-all-test-cross + CONFIGURE_ARGS: --disable-docs --disable-tools --disable-system + MAKE_CHECK_ARGS: check-tcg + TARGETS: ppc64abi32-linux-user tilegx-linux-user + allow_failure: true + build-oss-fuzz: <<: *native_build_job_definition variables: diff --git a/.travis.yml b/.travis.yml index 65341634d02a..c75221dca3e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -344,10 +344,9 @@ jobs: # Run check-tcg against linux-user (with plugins) # we skip sparc64-linux-user until it has been fixed somewhat # we skip cris-linux-user as it doesn't use the common run loop - # we skip ppc64abi32-linux-user as it seems to have a broken libc - name: "GCC plugins check-tcg (user)" env: - - CONFIG="--disable-system --enable-plugins --enable-debug-tcg --target-list-exclude=sparc64-linux-user,cris-linux-user,ppc64abi32-linux-user" + - CONFIG="--disable-system --enable-plugins --enable-debug-tcg --target-list-exclude=sparc64-linux-user,cris-linux-user" - TEST_BUILD_CMD="make build-tcg" - TEST_CMD="make check-tcg" - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg" From patchwork Wed Sep 16 12:26:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 273556 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3889BC43461 for ; Wed, 16 Sep 2020 12:43:23 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B10CD22266 for ; Wed, 16 Sep 2020 12:43:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="KYQlmSYz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B10CD22266 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:49560 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kIWmP-0007PL-Q3 for qemu-devel@archiver.kernel.org; Wed, 16 Sep 2020 08:43:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36760) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kIWWh-0002dJ-Od for qemu-devel@nongnu.org; Wed, 16 Sep 2020 08:27:07 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:37867) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kIWWe-0005A8-1q for qemu-devel@nongnu.org; Wed, 16 Sep 2020 08:27:07 -0400 Received: by mail-wr1-x433.google.com with SMTP id z4so6733914wrr.4 for ; Wed, 16 Sep 2020 05:27:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=F6UCai1slxaYSjxJW3Hv6F6J3+vyen6Qm4XWJ5JFqqg=; b=KYQlmSYzajeEI6/WqffnWQlhXmJ/IsK+cb3WxETHOEEakDSaj9RPqN190RmmSxo+0L wVMZApTCrC66LQji/4P7HGKWuBN0ajEFzD0dAzWaMYoTdvsnxUO5OOqHbvxwh9uNUpi6 tGJuxq6ebHYBBjUxRWRgGgNUbMkPWOSMPnOHJ/68rxKFzBX7Zku3hPdRrDik88PnW7oD kQ0b5YTeBT5vKKvduxFSrDcWsDe5mBwoou37pTX/hrbsJFdxS/1PmzqJA1zTjF/n7DFm AgoVGxr+PQZ0/XKqmRdwMFJ+FSP7jCckpTKXwMaTDR/dYVWJFiJHB1dEgx6G9vQibgqs R/Yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=F6UCai1slxaYSjxJW3Hv6F6J3+vyen6Qm4XWJ5JFqqg=; b=WFY10yfCtfnYiQfxpswsHYWn77VOZCX2LPGYylr1VqK3pXPTn0DdeAmFzMn6AjFnF2 d+JXA83hcwkwPCw5om59OdgvePPEr630ktrj9siSTf/co5U61gwoBAtxi3cscLK5+uqe xVp0Ibura4V2ZVj94is4ZnZcytSQ44IgB3g37SIYUMip6DGLYrC8Sv9HwL53kPsTGj9I cVd/UIFPrBFrd0f4pXF4EXszw/MUk1NQO1QOao2LLUesLN2fHggUq+nuPOewiq/Ak+6V mbSNHj7/t1KnnB3gOS5gyTsNro8vOi6H4Dp/A6Tf1F+aIJU6LYj29y4j3ctX/3Y03vZt M3Yw== X-Gm-Message-State: AOAM533zcNcOgGdcbtfuVGdvBdCsRTmk5TizY01DXJs5qufB4XQsopOm giTEMeTQxyroPMSkRwUAhhPhTg== X-Google-Smtp-Source: ABdhPJyWcGFZYFALTBBqMCYjnaK95HwOIx91D5tX1rB0jA0FQGrm4i8W7RxyFhAuxAy69/fEns1ILA== X-Received: by 2002:a5d:4682:: with SMTP id u2mr28384470wrq.254.1600259222778; Wed, 16 Sep 2020 05:27:02 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u12sm5055970wrt.81.2020.09.16.05.26.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Sep 2020 05:26:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3400A1FF96; Wed, 16 Sep 2020 13:26:49 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 8/8] configure: add [lm32|unicore32]-softmmu to deprecation logic Date: Wed, 16 Sep 2020 13:26:48 +0100 Message-Id: <20200916122648.17468-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200916122648.17468-1-alex.bennee@linaro.org> References: <20200916122648.17468-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x433.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Alex_Ben?= =?utf-8?q?n=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" While we are at it move the few places where they are into the deprecation build bucket. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20200915134317.11110-9-alex.bennee@linaro.org> diff --git a/configure b/configure index dfd7f18dcb24..756447900855 100755 --- a/configure +++ b/configure @@ -280,7 +280,7 @@ supported_whpx_target() { return 1 } -deprecated_targets_list=ppc64abi32-linux-user,tilegx-linux-user +deprecated_targets_list=ppc64abi32-linux-user,tilegx-linux-user,lm32-softmmu,unicore32-softmmu deprecated_features="" supported_target() { diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f027b55aef15..a18e18b57e54 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -134,7 +134,7 @@ build-system-fedora: variables: IMAGE: fedora CONFIGURE_ARGS: --disable-gcrypt --enable-nettle - TARGETS: tricore-softmmu unicore32-softmmu microblaze-softmmu mips-softmmu + TARGETS: tricore-softmmu microblaze-softmmu mips-softmmu xtensa-softmmu m68k-softmmu riscv32-softmmu ppc-softmmu sparc64-softmmu MAKE_CHECK_ARGS: check-build artifacts: @@ -166,7 +166,7 @@ build-system-centos: variables: IMAGE: centos8 CONFIGURE_ARGS: --disable-nettle --enable-gcrypt - TARGETS: ppc64-softmmu lm32-softmmu or1k-softmmu s390x-softmmu + TARGETS: ppc64-softmmu or1k-softmmu s390x-softmmu x86_64-softmmu rx-softmmu sh4-softmmu nios2-softmmu MAKE_CHECK_ARGS: check-build artifacts: @@ -259,9 +259,10 @@ build-deprecated: <<: *native_build_job_definition variables: IMAGE: debian-all-test-cross - CONFIGURE_ARGS: --disable-docs --disable-tools --disable-system + CONFIGURE_ARGS: --disable-docs --disable-tools MAKE_CHECK_ARGS: check-tcg - TARGETS: ppc64abi32-linux-user tilegx-linux-user + TARGETS: ppc64abi32-linux-user tilegx-linux-user lm32-softmmu + unicore32-softmmu allow_failure: true build-oss-fuzz: diff --git a/.shippable.yml b/.shippable.yml index 89d8be4291b0..0b4fd6df1d81 100644 --- a/.shippable.yml +++ b/.shippable.yml @@ -8,7 +8,7 @@ env: - IMAGE=debian-amd64 TARGET_LIST=x86_64-softmmu,x86_64-linux-user - IMAGE=debian-win32-cross - TARGET_LIST=arm-softmmu,i386-softmmu,lm32-softmmu + TARGET_LIST=arm-softmmu,i386-softmmu - IMAGE=debian-win64-cross TARGET_LIST=aarch64-softmmu,sparc64-softmmu,x86_64-softmmu - IMAGE=debian-armel-cross