From nobody Wed May 22 01:42:36 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1612273323; cv=none; d=zohomail.com; s=zohoarc; b=OPPYAKQKzCrfU7HA0NdSQhrg4SFv7D2VCtVzzpL9cfJfR7Ykf2In/xT8JXqIkmMvLX/6U9dRGMcupW8CnL8sWrJVTtepawB1eEGLj7KhuCLpkgssNC7uvOKde61lEgVjc5xE1Yv3T5/okZs7slnzhiyCTXtGa+vX4b50k210SDI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612273323; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Z1pwI3vYS5zF+thwL7KFBLXWBDqCuQgrG7iqQ6JY8Jc=; b=dfaP1/iUGvYldKNuf29TblgyKl1oK4xUaKA4+EZH7gdxeFHzOxyPSKYsepRvTlkWghogKcvR+eGrXG73Rx9Xl0mRjHXbCi4us1znFwkhsMWymj/mkXcgoPo/BES2REB4eW+mE0bzNT0wOGV5tGktrRsx6GPFWblJiahDkO9v9o8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 161227332300383.12988125786501; Tue, 2 Feb 2021 05:42:03 -0800 (PST) Received: from localhost ([::1]:37966 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6vwP-00052p-LP for importer@patchew.org; Tue, 02 Feb 2021 08:42:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57020) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6vub-0003LB-MH for qemu-devel@nongnu.org; Tue, 02 Feb 2021 08:40:09 -0500 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:45349) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l6vuX-0007BE-7m for qemu-devel@nongnu.org; Tue, 02 Feb 2021 08:40:09 -0500 Received: by mail-wr1-x436.google.com with SMTP id m13so20505619wro.12 for ; Tue, 02 Feb 2021 05:40:04 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l5sm31236666wrv.44.2021.02.02.05.40.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 05:40:01 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 28AEE1FF87; Tue, 2 Feb 2021 13:40:01 +0000 (GMT) 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=Z1pwI3vYS5zF+thwL7KFBLXWBDqCuQgrG7iqQ6JY8Jc=; b=u1klnQGSTEo6hf4byB6sBvfA1jNAEh3AOlKowF/p1/WbwFwX1nBJX4JDnjv81+2L1P zEZGhuIi1pX+OIXh/ZwJqNAEj/AMFFSfxPTQGzFhiBwM6f6dJ1IIo/KfoCriNpGhhof6 INsl0uyC4xgVYfFUXnDh/KzRmci99PSt7YVfFnloMM7r5Ji2lzNSm0WfQEOb7U3YL9YG hRjujl3jOZ6U64xaQc1H30kVBQcivbJ54j1JoUxpT58MsqhB9luq5oevLJMEV0OfyGYH MTJbNHvtiLOAFbu6AbHVUAxj+5SNNzD1m9Wje0TOfT1TGCaa3ePrDvY14NHZV8dLMye7 Vl+A== 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=Z1pwI3vYS5zF+thwL7KFBLXWBDqCuQgrG7iqQ6JY8Jc=; b=Ep6dBXgtXxNnYBqD9osgFFk2qgBQcOfHSmiW8RMy6367r/MeNkFwsNtWdZoGuf2OfD FlnBObasrG2hwW2hWxN8wSUh011wvhppEWj5JB2NVS+0c9j5yJ5UptVQ/wIphvyGST+E k7UaWX9V71KXF16B3ZQshdXVq9Kw0ihdcMaPsO1ylrmi8S3mdf8SJjywfUXv3dVPjAzn mig42fFnnBpOGrl7BKVH9F98Sf7sfDrHLv4YA0dHMUxq9XS6xjXiwd536t+r+EVA2EeB qh2DFNMaMxjXeJAhZ6zW7iQWjMtCF88m7TOpN9s4cN9sx5ztlXVCloaFwANow8iTrwf3 gW4g== X-Gm-Message-State: AOAM530Nm/aTUrWtfGwKq/wNNkZYbc63ADXdgu/G/KK9SufuxqAtze0w kwCaMKPE1BLfxmYJGW3BgZvuqA== X-Google-Smtp-Source: ABdhPJziRGZznxXdte3maf/AueRA0V/eJQgns3xqzqt3SE3E2J/xZ2YgPPYic008KvdRJWSbyl0hMg== X-Received: by 2002:a5d:44ce:: with SMTP id z14mr9095707wrr.330.1612273203808; Tue, 02 Feb 2021 05:40:03 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 01/15] tests/docker: Fix _get_so_libs() for docker-binfmt-image Date: Tue, 2 Feb 2021 13:39:46 +0000 Message-Id: <20210202134001.25738-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210202134001.25738-1-alex.bennee@linaro.org> References: <20210202134001.25738-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x436.google.com 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 , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 Fix a variable rename mistake from commit 5e33f7fead5: Traceback (most recent call last): File "./tests/docker/docker.py", line 710, in sys.exit(main()) File "./tests/docker/docker.py", line 706, in main return args.cmdobj.run(args, argv) File "./tests/docker/docker.py", line 489, in run _copy_binary_with_libs(args.include_executable, File "./tests/docker/docker.py", line 149, in _copy_binary_with_libs libs =3D _get_so_libs(src) File "./tests/docker/docker.py", line 123, in _get_so_libs libs.append(s.group(1)) NameError: name 's' is not defined Fixes: 5e33f7fead5 ("tests/docker: better handle symlinked libs") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Alex Benn=C3=A9e Message-Id: <20210119050149.516910-1-f4bug@amsat.org> --- tests/docker/docker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 884dfeb29c..0b4f6167b3 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -120,7 +120,7 @@ def _get_so_libs(executable): search =3D ldd_re.search(line) if search: try: - libs.append(s.group(1)) + libs.append(search.group(1)) except IndexError: pass except subprocess.CalledProcessError: --=20 2.20.1 From nobody Wed May 22 01:42:36 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1612273498; cv=none; d=zohomail.com; s=zohoarc; b=Qhdv7USy5Cytt1UhmsoKd64MVomEvh3/kpz7Cou1wagUwF9wQ0pR2VIz3KxoZ8xVfhlSxc/HdLzqWNOt8I3CYIiQk52sC02OJg2Lduc/zG+LoWTwq7FEX60fsyWW4M+GoVHT0s0o8YlgGn8uxFke28WOfZYXrXqdKeBOHr1roUw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612273498; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=sE2rw1O4u9cYqn0FvywReTtt3n/OCFCQyRnzm4hokb8=; b=WvIvHDcNqAkzjanNGMzbiMYCz+kNr7zNUFvssez3e67ya0ksIifUNVWgMm3zE+ZBL5kFtvRZ2OraGGkYip1GMZ+UzBipHEB3xlBROMbRcUMlQPFzJ/jgJBmiubZ6QuO8Bg31YI4wN8E4SPqYKCoaIEhmb0Ui3Ke0iLc+wEYajEc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1612273498105140.70921820877754; Tue, 2 Feb 2021 05:44:58 -0800 (PST) Received: from localhost ([::1]:46596 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6vzE-00007O-1h for importer@patchew.org; Tue, 02 Feb 2021 08:44:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57032) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6vuc-0003LV-BV for qemu-devel@nongnu.org; Tue, 02 Feb 2021 08:40:10 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:39541) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l6vuZ-0007CW-9y for qemu-devel@nongnu.org; Tue, 02 Feb 2021 08:40:10 -0500 Received: by mail-wr1-x432.google.com with SMTP id a1so20508926wrq.6 for ; Tue, 02 Feb 2021 05:40:06 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q9sm3585131wme.18.2021.02.02.05.40.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 05:40:01 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3E56E1FF8C; Tue, 2 Feb 2021 13:40:01 +0000 (GMT) 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=sE2rw1O4u9cYqn0FvywReTtt3n/OCFCQyRnzm4hokb8=; b=uAafp6Y7638pA3v8xP3GJROc835hBiks+hL0+AAGj1PikuOwlfGrsG3I8bwklAXL73 fXYXMUhhGBC0498L3g5a4H9qwzdZTweOKkOSmSNtPugJixpUSMf2EuiNfIBhiOyegvs1 Oduzp1ZSe+wTI8ALij0bauneFiNR5vASIYbGe3JD43sicBYZ8GJx3ezy0ocxartDlBey 4PrYtEU71ilW26xpDYfd1+I41LsR3TlXSMzrdVSXzRPdsXzTVQ4+r1E8j66kLX9yjAB0 pOQnxsN/Or/etoRa5Rgz1Z/fCKHS67vAK5G7XCV5Y5WROEz5TrmB39KtUh6xu/TkJI0D NH+w== 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=sE2rw1O4u9cYqn0FvywReTtt3n/OCFCQyRnzm4hokb8=; b=TkxwnDYJFHfJ7j87KLXZRthPrzkxnQ6FTfnt+Gu3YD5/XmDLmkrhnvUfHLZQ97eCec ddQt3yUEEthoEZ9GDC1CS6lxU8z6n+xKbef7BdDPqhnTf69yzcBGnMdjSfITbTSELDQp /TX5dhbOk2q9kBZjnY3Q06e+xxr0nb63LAQ5lGroe2gr1KexmNrVwMT8tr3z+ReXKNYX NCRVImv5nYhY7awBsDavrFYPD9wtj2YIlHdpsZ3oUPQ6ph68rzBnociL8qpneuI+zAsi 9pHz7f+qn+kVinS1UfX3nUp4L6+j9ptBmeESXhFdO8HPIS2T3MRn+uvZU0dP5DO5eeiN nILw== X-Gm-Message-State: AOAM530bhWlD9jVFmauZWtzjMnN2coi4b0olhmtuIvUCt++lxeavGcBo IMcmIYHalGUKDZRktVEXP2g1O+ZXTTOQXXJM X-Google-Smtp-Source: ABdhPJxLbYnHNWlbghEN5jt0+e90xkI3FhkjV8yln3CRNIWKjgLMVBceX3zxl9AjMKVlVTRBgJJCqQ== X-Received: by 2002:adf:c6c1:: with SMTP id c1mr23812396wrh.326.1612273205867; Tue, 02 Feb 2021 05:40:05 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 02/15] tests/docker: Fix typo in help message Date: Tue, 2 Feb 2021 13:39:47 +0000 Message-Id: <20210202134001.25738-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210202134001.25738-1-alex.bennee@linaro.org> References: <20210202134001.25738-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.google.com 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 , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 To have the variable properly passed, we need to set it, ie. NOUSER=3D1. Fix the message displayed by 'make docker'. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Alex Benn=C3=A9e Message-Id: <20210119052120.522069-1-f4bug@amsat.org> --- tests/docker/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 0779dab5b9..bdc53ddfcf 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -209,7 +209,7 @@ endif @echo ' before running the command.' @echo ' NETWORK=3D1 Enable virtual network interface with d= efault backend.' @echo ' NETWORK=3D$$BACKEND Enable virtual network interface with = $$BACKEND.' - @echo ' NOUSER Define to disable adding current user to = containers passwd.' + @echo ' NOUSER=3D1 Define to disable adding current user t= o containers passwd.' @echo ' NOCACHE=3D1 Ignore cache when build images.' @echo ' EXECUTABLE=3D Include executable in image.' @echo ' EXTRA_FILES=3D" [... ]"' --=20 2.20.1 From nobody Wed May 22 01:42:36 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1612273497; cv=none; d=zohomail.com; s=zohoarc; b=G+YSgbjt4DlCnWG1peewAVM17ifE0rLaqLEtyH96p4OaD2Zf7Mh0wF+8XrTOADoAJvCcFX7iJ9PBOKMp+ewQOh9tvcCv2FQyOa4i608gtNVLkWEgSHb78qeC/BL990MPemH1Hz8N1y1ryO4ssVoedrpQRpiKTriyWyAejD8elrc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612273497; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hf7ynIumjxT8747QQLhELSkjFJ2pAeJjBigreGwj8dE=; b=kMmFJzMuSn7ZVdGAkBGnBDto2trT+Gb++BvaERwwqtam1C9i8cy1mDt58PtBnBhidTHMwvWIUN2Jt3CkOivRzXOPHzUg3SO8RLJ7MuDJP5vyl5VURsCAzcKnxHveyEB/5LN2N0U4lwpdZHNfXfDItOpEheHG7YoLo5y430zK+oU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1612273497534279.9075658409919; Tue, 2 Feb 2021 05:44:57 -0800 (PST) Received: from localhost ([::1]:46510 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6vzD-00005M-Db for importer@patchew.org; Tue, 02 Feb 2021 08:44:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57056) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6vud-0003N3-Ro for qemu-devel@nongnu.org; Tue, 02 Feb 2021 08:40:11 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:35446) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l6vua-0007Cw-DW for qemu-devel@nongnu.org; Tue, 02 Feb 2021 08:40:11 -0500 Received: by mail-wr1-x431.google.com with SMTP id l12so20510934wry.2 for ; Tue, 02 Feb 2021 05:40:08 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y83sm2943850wmc.12.2021.02.02.05.40.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 05:40:04 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 54C561FF8F; Tue, 2 Feb 2021 13:40:01 +0000 (GMT) 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=hf7ynIumjxT8747QQLhELSkjFJ2pAeJjBigreGwj8dE=; b=YABLiXeMGr3BBdL50nwfRSsnkNKABzChn1IbOnojpGsGDCWh5EaxL01BArDGV6OIBE 3ro+sEHrzQfpTDPruAYNlrYfSN8cuc/y6L1vkcoiGZHlW9wJkxyLCMq5duCyVHnebdjH H6dZkPDYe1dUATv3EpqL53vZzL41ddf476rFrjgIFxanmFytfoC75BuZSHyp92uMEU/M nWgFYIhADt2OFhKwh3Nibg+m2kNBX9j11fRysUwv+2z+JDJMgCdOOuRPVmaNKwUr0Ea/ p1kOrDsU9rKjGP3kzxPkZGP1iJN1Mw+9DSlPgDmH5BzWY9T35vGFx8WJNmiU+IIpCKSx lXIQ== 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=hf7ynIumjxT8747QQLhELSkjFJ2pAeJjBigreGwj8dE=; b=D4Ad2YeAsiErfKA95MH8WDm6o8/0wPU8fFiUNCVD1fht4bLknvIw/89Hyv1HSEc1uV CiWkmoq6uwNQqPT8xoIlPQnuEbEIVYCKmfCioSr8PzBsLZ5kV1DmTqJIfIxL3csGQKRy cnAA5ml8VphtcFdx9WX+V1TBDJfwQme6H6kYjnb0IGvTYBdH/CNXNdSMgGd/TmnwDFID tXbUJNFZ9VnSWpRqcqnmSzvKcT8anQC3cPSglGJ9WDTth2msQX7TO8XRRlPeBgcSBHcH Yv4GBhXbmmnLLP+r53JlX6+Cj+0T7fhGe1ccenJWP6IA6rPZUUagAJCKUSwqD2JTpDaa TVYg== X-Gm-Message-State: AOAM5330ycPG2IysGdC7F+nMb8qgVuYohmoZfaKemrd0E7KY46t3YbZE cem/8EB0bnX7VIF+y9v4kHe7RtTdbZ3H4UaB X-Google-Smtp-Source: ABdhPJxOzagu+nNcursGQTHP7HrU1VbbiR1bJ6ShOy9jJ0sD7BGJBEwXyPIB8yIgIA9+tCuO9DRT0w== X-Received: by 2002:a05:6000:1043:: with SMTP id c3mr24042762wrx.140.1612273207118; Tue, 02 Feb 2021 05:40:07 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 03/15] tests/docker: make _copy_with_mkdir accept missing files Date: Tue, 2 Feb 2021 13:39:48 +0000 Message-Id: <20210202134001.25738-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210202134001.25738-1-alex.bennee@linaro.org> References: <20210202134001.25738-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x431.google.com 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 , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Depending on the linker/ldd setup we might get a file with no path. Typically this is the psuedo library linux-vdso.so which doesn't actually exist on the disk. Rather than try and catch these distro specific edge cases just shout about it and try and continue. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- tests/docker/docker.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 0b4f6167b3..fb3de41c0b 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -103,7 +103,12 @@ def _copy_with_mkdir(src, root_dir, sub_path=3D'.'): pass =20 dest_file =3D "%s/%s" % (dest_dir, os.path.basename(src)) - copy(src, dest_file) + + try: + copy(src, dest_file) + except FileNotFoundError: + print("Couldn't copy %s to %s" % (src, dest_file)) + pass =20 =20 def _get_so_libs(executable): --=20 2.20.1 From nobody Wed May 22 01:42:36 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1612273324; cv=none; d=zohomail.com; s=zohoarc; b=lDqXftAVKtvDtyE4EqHF48RLIndb5TEKBhPJJOO900fKdPGWsEB22lXAezyI7sjG+rKCXQ0RKWoQYx+/7oHi5zkbIgdLXK4TUlun5MELZ5e5mJWpcoyTv/8/Kl/4Bm58wmgZJUUiDJvW4bbSdbjUDryDoFM2av/X4Xo+hXob6V4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612273324; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=l9hs2c1uUiGj7MHevQ781qlr6u6iQ0XBGuGPt72flqQ=; b=fjpAFN+mxIaoAW50dtxlX7YOpD+xKZaT3R5Dn88lmZLSuMnx04NT7GJLY7TBWKR3UQ2yWaU4fVNWTJ7x3+IKljY15QtG6vZgYNz8/fSJyasSZtcSiM6ROjXaVVkTD0MtgGi8tHV0DfhMzm00lQ51Ve6jVbAzXAj9SsdcGL/dzvk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16122733246542.61296429583831; Tue, 2 Feb 2021 05:42:04 -0800 (PST) Received: from localhost ([::1]:38170 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6vwR-000593-E7 for importer@patchew.org; Tue, 02 Feb 2021 08:42:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57058) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6vue-0003NT-1s for qemu-devel@nongnu.org; Tue, 02 Feb 2021 08:40:12 -0500 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:33537) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l6vuc-0007E5-Fa for qemu-devel@nongnu.org; Tue, 02 Feb 2021 08:40:11 -0500 Received: by mail-wr1-x436.google.com with SMTP id 7so20519597wrz.0 for ; Tue, 02 Feb 2021 05:40:10 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z18sm30974726wro.91.2021.02.02.05.40.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 05:40:05 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6C0371FF90; Tue, 2 Feb 2021 13:40:01 +0000 (GMT) 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=l9hs2c1uUiGj7MHevQ781qlr6u6iQ0XBGuGPt72flqQ=; b=BNTpJZirH3yvWYbcRx9zHha8EcmN96BF9Pq79cFrS4kb88guOWaXlgAE9UWu/GRrbX 1RCCJVd0h4c+Dw1o7iXVsxh+YrqHpm5uiDXfoVCOYuBwoI1D55ba7vkM/jOKtTyaC0nl ekt1ci1R2EJGKrHwjHw39QrA7QxHvOhCzahnbyZ+KGqFmOztrj01mGXWNWTzq633PHPy NZvKiLZG4smmloEyvoynwZ1pSDEUPK4cUPVJEmGx3nelctqSAAmpif4b+uLwD05JifM7 POoCdTn6W5okknKDU9fVD0PN7iIAX62+nri9hNXFMyFnIt2/3TjMizURlb8YYlSmHnCR g/iA== 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=l9hs2c1uUiGj7MHevQ781qlr6u6iQ0XBGuGPt72flqQ=; b=eI9n3fWs8adZCtaX3EQ99QHNwEY4xKj4hFAnP2Yj4wzurDI2yoUzQ+2EVs6vOi8nkg yUIxK7oaEcQVrQnZzu+Pj3WIuoXhx4klNIlnBC+fhhi+U+lN2HebKa5ip3ceELS5jPp+ stJIUEVO8p6tLLn3N44AF1ReLNlRTWGJMMma0tyINt7+n+oADT8IkZypLRqlI4F0I/3G XcXBV8FXaZfzgRzZYO5AVGKvM12C3muBV60mk/cFy31vE3uk/Fw078b9u9r5hu9Qsytl KQiqcO7xEWfKEn5byoG3uFMuHcXCf3ncLi1rp21Ah74GuvYC4xg8Z3XRoAvBThraXdUK 9NOw== X-Gm-Message-State: AOAM533/DgObxy89lz6NFh6rhfTlsdjsgf9oa8dutIrFPkZGaSXcgT/3 U5gnVtzOqVjZxmad2xFm9FbHLHUTuk8aIPso X-Google-Smtp-Source: ABdhPJwiXmuHZEs1Z7VhgCzAmhU2NqXqoOvIzy5L3c9TmqZRziBgOUW45O8n6hXYYR9rnYDWXY/11A== X-Received: by 2002:a5d:68c1:: with SMTP id p1mr23631107wrw.325.1612273209302; Tue, 02 Feb 2021 05:40:09 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 04/15] tests/docker: preserve original name when copying libs Date: Tue, 2 Feb 2021 13:39:49 +0000 Message-Id: <20210202134001.25738-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210202134001.25738-1-alex.bennee@linaro.org> References: <20210202134001.25738-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x436.google.com 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 , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) While it is important we chase down the symlinks to copy the correct data we can confuse the kernel by renaming the interpreter to what is in the binary. Extend _copy_with_mkdir to preserve the original name of the file when asked. Fixes: 5e33f7fead ("tests/docker: better handle symlinked libs") Signed-off-by: Alex Benn=C3=A9e --- tests/docker/docker.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/docker/docker.py b/tests/docker/docker.py index fb3de41c0b..39da3fefcf 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -93,7 +93,7 @@ def _guess_engine_command(): commands_txt) =20 =20 -def _copy_with_mkdir(src, root_dir, sub_path=3D'.'): +def _copy_with_mkdir(src, root_dir, sub_path=3D'.', name=3DNone): """Copy src into root_dir, creating sub_path as needed.""" dest_dir =3D os.path.normpath("%s/%s" % (root_dir, sub_path)) try: @@ -102,7 +102,7 @@ def _copy_with_mkdir(src, root_dir, sub_path=3D'.'): # we can safely ignore already created directories pass =20 - dest_file =3D "%s/%s" % (dest_dir, os.path.basename(src)) + dest_file =3D "%s/%s" % (dest_dir, name if name else os.path.basename(= src)) =20 try: copy(src, dest_file) @@ -155,8 +155,9 @@ def _copy_binary_with_libs(src, bin_dest, dest_dir): if libs: for l in libs: so_path =3D os.path.dirname(l) + name =3D os.path.basename(l) real_l =3D os.path.realpath(l) - _copy_with_mkdir(real_l, dest_dir, so_path) + _copy_with_mkdir(real_l, dest_dir, so_path, name) =20 =20 def _check_binfmt_misc(executable): --=20 2.20.1 From nobody Wed May 22 01:42:36 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1612273329; cv=none; d=zohomail.com; s=zohoarc; b=m0msfiFPfql+iprvr/NpndU//LuY28JQ1WjFuZYD4GqzipiP7oySl74Wpvae0C5tzUM9FDuUGbu8txuKRdQ+oRtUJJGNxEsgFaUSYWIiXrGSLUSk5tZ0N+Qndyh6MuX8cKMQ/WMghWEOV1DEdE/AO/8o2lKdIPh5ciQuSwuOtJs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612273329; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=nz9Cq00egLL1TS+HApF3A/Rij9QOF1bLxSf/x22iz8s=; b=P4Px0RXO5g8Hki5b0slrQ9cePLTOHPmqM5AAGwG5Uf/5XfwZs6XuhAMU/syUoASu4gfbu7OisHtV25veILxquOeb7+84IrYNIqNRT8uX/khNHjAaXwS6clupACiu5b9wKSKR77YXHwsHYSztLKoUaQYQRuZkeX5h1uWtnGC0w7A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1612273329203208.1860358121196; Tue, 2 Feb 2021 05:42:09 -0800 (PST) Received: from localhost ([::1]:38676 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6vwW-0005LH-4O for importer@patchew.org; Tue, 02 Feb 2021 08:42:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57104) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6vuj-0003XH-1q for qemu-devel@nongnu.org; Tue, 02 Feb 2021 08:40:17 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:44360) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l6vud-0007En-JK for qemu-devel@nongnu.org; Tue, 02 Feb 2021 08:40:16 -0500 Received: by mail-wr1-x429.google.com with SMTP id d16so20465806wro.11 for ; Tue, 02 Feb 2021 05:40:11 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id w14sm31546040wro.86.2021.02.02.05.40.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 05:40:05 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8353F1FF91; Tue, 2 Feb 2021 13:40:01 +0000 (GMT) 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=nz9Cq00egLL1TS+HApF3A/Rij9QOF1bLxSf/x22iz8s=; b=NPX8qwmDqvXBYLmk5XWrOdcDhpWowCVXP1W1MLuLOmPhuj/8OMVAQROO4BlGx9L1X7 9bylHxTiWWjZsWm030JFjpH8BNDU6sh0oHkLE3ZcT83M+LHtYgODEiX5YBgC6k+S7lv5 /vaall09qKDlEGmpMgjSrpS6BvZRtdYcYIKv7NNyBALZS6JvEmEitE5BUVaKIdvi7OFM Pg1vyPXKU8g/6h924axt0d9EKnZBuKlDl/nQoWNn9iwETE8t2WB2M9ILXn47B73lXPp/ WMtOjNlUp+dRPWSRQS293NBbJWk7eDNR0EQnG8lqP51f0diKyEs1UVqRqLX8OR9e2MJG B0DQ== 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=nz9Cq00egLL1TS+HApF3A/Rij9QOF1bLxSf/x22iz8s=; b=dhbE2fNj1x3ffbriiq3NRh0xW/9T8THx6jJq9tzOeFyb+Gw2PO5zHmPFewoCR0waNU Sue8GIlefoWJaRQmpy5vteCY/a8Bl2/ykpST3XFrNxA4y6fxaCS5LV7afExh/58D+lt2 WMn1mIixej1XWnjYw4HDJL+ryVGuvrCWGO0fAsJHoAmxcciTeoIN9xstK/NOKK1X/BDG xGwRn6OAF89gqNsITIRlYjjA2p2B1I8IClaFHUqpZp7HLI6b4O6qK4qbD9vg489WLbxd HEhSeuWz6ggNUSMVddbFvTRFQ3iu/AskASXs6Gj8gzLUlTnSKS7/fBdVU9030Z7IKiCU eftw== X-Gm-Message-State: AOAM531ZO29uPg7F1q14vmG8glreFAOsuytEWDtKxVM/Kmt8w/7cM2px DKf+t8lX38lZC9Uh4WFRVWgzazJLf7MZWyKm X-Google-Smtp-Source: ABdhPJziHBEtRSSrO8V8HLHyCCMtGlYZx8kv7H5h3qJG+rDWhyukr8O6rGBU7mqZx/1JbVU7squCcg== X-Received: by 2002:a5d:560c:: with SMTP id l12mr23188792wrv.417.1612273210219; Tue, 02 Feb 2021 05:40:10 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 05/15] tests/docker: alias docker-help target for consistency Date: Tue, 2 Feb 2021 13:39:50 +0000 Message-Id: <20210202134001.25738-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210202134001.25738-1-alex.bennee@linaro.org> References: <20210202134001.25738-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x429.google.com 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 , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) We have a bunch of -help targets so this will save some cognitive dissonance. Keep the original for those with muscle memory. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- v2 - also fix help-on-help text --- Makefile | 2 +- tests/docker/Makefile.include | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b0dff73904..d7fb6b270e 100644 --- a/Makefile +++ b/Makefile @@ -305,7 +305,7 @@ endif @echo 'Test targets:' $(call print-help,check,Run all tests (check-help for details)) $(call print-help,bench,Run all benchmarks) - $(call print-help,docker,Help about targets running tests inside containe= rs) + $(call print-help,docker-help,Help about targets running tests inside con= tainers) $(call print-help,vm-help,Help about targets running tests inside VM) @echo '' @echo 'Documentation targets:' diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index bdc53ddfcf..a5c1e4a615 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -1,6 +1,6 @@ # Makefile for Docker tests =20 -.PHONY: docker docker-test docker-clean docker-image docker-qemu-src +.PHONY: docker docker-help docker-test docker-clean docker-image docker-qe= mu-src =20 NULL :=3D SPACE :=3D $(NULL) # @@ -218,6 +218,8 @@ endif @echo ' Specify which container engine to run.' @echo ' REGISTRY=3Durl Cache builds from registry (default:$(D= OCKER_REGISTRY))' =20 +docker-help: docker + # This rule if for directly running against an arbitrary docker target. # It is called by the expanded docker targets (e.g. make # docker-test-foo@bar) which will do additional verification. --=20 2.20.1 From nobody Wed May 22 01:42:36 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1612273716; cv=none; d=zohomail.com; s=zohoarc; b=J11WWF2IQrfnuGfdbR2Gd/tmB8ZlqggoY1u57N7zTQSuU0h0COcxlvvI1SIcBRAyRIl2xoVuob8ElNAEfE2DOjDu4rWuRMESfhsPgcAqdZJdd8gp3M6xoZTzvoZPoQ0JC9fXJplYzEea3Q1eXqCKklrQ4XO6FMesIpzdVjVRuSQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612273716; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=r/l3rZk8GOIQaj/zcskGUMbwB8AQ01WgfPICmp322OI=; b=ReyqGKFvaZmJqLz9fXmbpwzCraIaTB/65mTJAypk75zm+JB4Bokwew0oA/vBMp4z0vN8KVP/w/xMIbaOz533ODYeWhxs8Wy2fQgCr8kjMwm2OTCrOIsaNfIOcyu9BGANe2tg0bYEXY7N+OQ7iD+SDlGowPcYKOkteBhU4t/J0ac= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1612273716150545.9617795895559; Tue, 2 Feb 2021 05:48:36 -0800 (PST) Received: from localhost ([::1]:54414 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6w2k-0003hC-QI for importer@patchew.org; Tue, 02 Feb 2021 08:48:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57126) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6vuk-0003Z4-1v for qemu-devel@nongnu.org; Tue, 02 Feb 2021 08:40:18 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:38262) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l6vuf-0007Fo-ES for qemu-devel@nongnu.org; Tue, 02 Feb 2021 08:40:17 -0500 Received: by mail-wr1-x435.google.com with SMTP id b3so2372072wrj.5 for ; Tue, 02 Feb 2021 05:40:13 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id i18sm23889386wrn.29.2021.02.02.05.40.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 05:40:05 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9B7F91FF92; Tue, 2 Feb 2021 13:40:01 +0000 (GMT) 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=r/l3rZk8GOIQaj/zcskGUMbwB8AQ01WgfPICmp322OI=; b=VUjtQCsj7xSH2D5ZxOypbaGX+DCqils7sf7cu2OxZjK3Cj+aEplqfGwynFU00X72RC IngHJHxaYBOFxb05qdv5ned4nTyYLmP5xpgKQDWtn7yHUsu1fWd8O2vfUZUGxF8HXvks IUinTp3aShjITyJvAr68d3/QxSiGTnG++9yya4COYthLCv99ssdh7LKxhiHqexVt5KlE By/BoPQaVRb3zjpHJHe3O6DgqKgheSFreREkBwxTyXDndAoYFSc8krJ6h9u8zH2h161l jUQSkTm+njPKSYh9L0k4d8U0jBNO0FHs1TphKgTmyBn9P2FOlOoP58UUAhSzBcY12yZ8 FAcw== 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=r/l3rZk8GOIQaj/zcskGUMbwB8AQ01WgfPICmp322OI=; b=I7Yfq0jaaH71/ZrsPcb5o9zFLu5BsBo/h2pKhmI4Kvf8SKB80I5ypkLQBa2EJGIaNz IOjbeHTZ3f70l62xKrnCZJicvceGhyRcaFa547AokVCwAnpn8rOtVqH7iOG3aeB2bB4e 0x3ruqpfjqWW0I2+CDMrGpplnI6MM/vMNdf9wgKIp0bioERBaE5Ku2c7WCBxQSdbyb2E 4oTEwiC5QfAG0koRsIKFFgSnSeklOrTF8vMFCr73CuIZx/9f25MHdS4h4gzrLRqtON7r ALCF8tFYiOHRusNWXBFHboaISA9YTok+hCD/OeXkLe2HVnQ+S6FozYYoGoY0ioffYZ74 xVyA== X-Gm-Message-State: AOAM530xgU0GTyw8YfHA9ZOlGHO94RrvR6/iUn/iasDVQFzPZPCaUwFa Jsux/RtJSLVv11oie6t9zoG7DpN8IY+C3VSc X-Google-Smtp-Source: ABdhPJzPf/uiG5f/1tS8E91IbiigY69x1GPSSHdu4A/F83RN8pmr6HGApcwWDRxmpTlUzuOyN3NO/w== X-Received: by 2002:adf:f90d:: with SMTP id b13mr17311031wrr.198.1612273212106; Tue, 02 Feb 2021 05:40:12 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 06/15] tests/docker: add a docker-exec-copy-test Date: Tue, 2 Feb 2021 13:39:51 +0000 Message-Id: <20210202134001.25738-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210202134001.25738-1-alex.bennee@linaro.org> References: <20210202134001.25738-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x435.google.com 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 , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) This provides test machinery for checking the QEMU copying logic works properly. It takes considerably less time to run than starting a debootstrap only for it to fail later. I considered adding a remove command to docker.py but figured that might be gold plating given the relative size of the containers compared to the ones with actual stuff in them. Signed-off-by: Alex Benn=C3=A9e --- tests/docker/Makefile.include | 20 +++++++++++++++++++- tests/docker/docker.py | 7 ++++++- tests/docker/dockerfiles/empty.docker | 8 ++++++++ 3 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 tests/docker/dockerfiles/empty.docker diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index a5c1e4a615..93b29ad823 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -11,7 +11,7 @@ HOST_ARCH =3D $(if $(ARCH),$(ARCH),$(shell uname -m)) DOCKER_SUFFIX :=3D .docker DOCKER_FILES_DIR :=3D $(SRC_PATH)/tests/docker/dockerfiles # we don't run tests on intermediate images (used as base by another image) -DOCKER_PARTIAL_IMAGES :=3D debian10 debian11 debian-bootstrap +DOCKER_PARTIAL_IMAGES :=3D debian10 debian11 debian-bootstrap empty DOCKER_IMAGES :=3D $(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DI= R)/*.docker)))) DOCKER_TARGETS :=3D $(patsubst %,docker-image-%,$(DOCKER_IMAGES)) # Use a global constant ccache directory to speed up repetitive builds @@ -92,6 +92,24 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian= -bootstrap.docker { echo "You will need to build $(EXECUTABLE)"; exit 1;},\ "CHECK", "debian-$* exists")) =20 +# These are test targets +USER_TCG_TARGETS=3D$(patsubst %-linux-user,qemu-%,$(filter %-linux-user,$(= TARGET_DIRS))) +EXEC_COPY_TESTS=3D$(patsubst %,docker-exec-copy-test-%, $(USER_TCG_TARGETS= )) + +$(EXEC_COPY_TESTS): docker-exec-copy-test-%: $(DOCKER_FILES_DIR)/empty.doc= ker + $(call quiet-command, \ + $(DOCKER_SCRIPT) build -t qemu/exec-copy-test-$* -f $< \ + $(if $V,,--quiet) --no-cache \ + --include-executable=3D$* \ + --skip-binfmt, \ + "TEST","copy $* to container") + $(call quiet-command, \ + $(DOCKER_SCRIPT) run qemu/exec-copy-test-$* \ + /$* -version > tests/docker-exec-copy-test-$*.out, \ + "TEST","check $* works in container") + +docker-exec-copy-test: $(EXEC_COPY_TESTS) + endif =20 # Enforce dependencies for composite images diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 39da3fefcf..d28df4c140 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -438,6 +438,9 @@ class BuildCommand(SubCommand): help=3D"""Specify a binary that will be copied= to the container together with all its dependent libraries""") + parser.add_argument("--skip-binfmt", + action=3D"store_true", + help=3D"""Skip binfmt entry check (used for te= sting)""") parser.add_argument("--extra-files", nargs=3D'*', help=3D"""Specify files that will be copied in= the Docker image, fulfilling the ADD directive fro= m the @@ -466,7 +469,9 @@ class BuildCommand(SubCommand): docker_dir =3D tempfile.mkdtemp(prefix=3D"docker_build") =20 # Validate binfmt_misc will work - if args.include_executable: + if args.skip_binfmt: + qpath =3D args.include_executable + elif args.include_executable: qpath, enabled =3D _check_binfmt_misc(args.include_executa= ble) if not enabled: return 1 diff --git a/tests/docker/dockerfiles/empty.docker b/tests/docker/dockerfil= es/empty.docker new file mode 100644 index 0000000000..9ba980f1a8 --- /dev/null +++ b/tests/docker/dockerfiles/empty.docker @@ -0,0 +1,8 @@ +# +# Empty Dockerfile +# + +FROM scratch + +# Add everything from the context into the container +ADD . / --=20 2.20.1 From nobody Wed May 22 01:42:36 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1612273503; cv=none; d=zohomail.com; s=zohoarc; b=eA6PamjfxwfnOjF3suqT5fdB9hHKhxCNc376DyAEOe+VJO9u3+YeDQUEzLRJ216VrG70Z3LA5b7WQMKxnjcdmB8j55Ctxb2+BZ6O7rt/jdv66FTVgn81FwQIYJVXd8Z+sGiETt8gDacc5+CWW2W2g4ILKv+gum4+qrSsMswXa+o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612273503; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gv66Zl+JJThTP2BwD8boLPRFsip1I6v/inGKghozlIo=; b=LxTHNtTwR+gTZ2Lz8wL54mIpquAzeEnC0L8c3+wal8Fg3NerjyK5gnUPFPTX5mbXNq8u/IFsa50dx61WI/K3nYHw8zreuF2WAw8VmEzrMr6oWHKTq2tK4lujnKPTH7LZxANGGe+y6PcFQEJz1VBXEyE0uvsWoFYJ4W5xvhhXpV4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 161227350385783.83472417823111; Tue, 2 Feb 2021 05:45:03 -0800 (PST) Received: from localhost ([::1]:47246 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6vzK-0000Om-KJ for importer@patchew.org; Tue, 02 Feb 2021 08:45:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57168) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6vun-0003i5-Iv for qemu-devel@nongnu.org; Tue, 02 Feb 2021 08:40:21 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:43941) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l6vui-0007HK-Gg for qemu-devel@nongnu.org; Tue, 02 Feb 2021 08:40:21 -0500 Received: by mail-wr1-x435.google.com with SMTP id z6so20440231wrq.10 for ; Tue, 02 Feb 2021 05:40:16 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id i18sm23889506wrn.29.2021.02.02.05.40.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 05:40:08 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B134F1FF93; Tue, 2 Feb 2021 13:40:01 +0000 (GMT) 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=gv66Zl+JJThTP2BwD8boLPRFsip1I6v/inGKghozlIo=; b=k1xSkQ7IJzkX11Fx+cOQ49iZecTLXnE6S1N5821XM1PW/ZzSFteclwslKRNMeU70TC NIr7+VxB7Z8MSX8ovAK4ZTTc0NT6eXV7nLAx5gfsJQnrtPutYISmkd8HedhhdcJRKh1x EKD6bWpZNC9xhQNAh0dI0EMzza59tviF5yUQ9rAXJo0Nna8ijInbdc3QNR3mxDw4XmYN oUdE+Ezxg5FOrLVs7B/3BKLwmzTr1G4+pJi+CigLdYE2s1pvLCkiYxPE+7N2YjJf4nK8 ym3STB69i12kS59u7otiyOzEPE3HAwc9G7bhHKbfo6wKtzoEfslT0y7k1oiixaQ6RD6Y pImA== 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=gv66Zl+JJThTP2BwD8boLPRFsip1I6v/inGKghozlIo=; b=Q1PgqqqVR8EXlAHHYobhCXb7POQHRy9WS8rh+SagAh8BKHxKM4dV7gacUZL8dsJL4K 7AusiyS+XQan20amkDPZ34R0kxphSFm76XrL+K0I7amTOwFTlyYms+V+M1u2ScCioqVp eJS31I7RdfugHMSrqDWdOCLFcC9xOVi02qNa+OglnMwjaUwPOii/vTghjR3b9sNXIG8l C1srAQnDrGfgHRhu1EgfBsLPm/v38l0d+GV1kR+L3SKSGkq0yMZPrKmnKEeE6kcCj00R P+4DJ/caIhTy9cmVEiML5by/lSBqlfHT96Y3okDAaM7lwEIu41185DNS2GSxMOJWVzuL l67A== X-Gm-Message-State: AOAM533NSTrkqqNYLFU0i+YZ3YLnkjWbJlsXWs3ZDmAGlMvG/3kPYzL3 5GEGgA+A7VuzCpoqF1mP9zEl+A== X-Google-Smtp-Source: ABdhPJzdA658RnOB39+X6c174hCUg4pxFcr6D7s9AiQDJ/4fIQDlA5a2yqSZNUyTAlAcQ0U2sRWvDg== X-Received: by 2002:a5d:62c1:: with SMTP id o1mr23022283wrv.275.1612273215295; Tue, 02 Feb 2021 05:40:15 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 07/15] configure: make version_ge more tolerant of shady version input Date: Tue, 2 Feb 2021 13:39:52 +0000 Message-Id: <20210202134001.25738-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210202134001.25738-1-alex.bennee@linaro.org> References: <20210202134001.25738-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x435.google.com 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: Paolo Bonzini , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) When checking GDB versions we have to tolerate all sorts of random distro extensions to the version string. While we already attempt to do some of that before we call version_ge is makes sense to try and regularise the first input by stripping extraneous -'s. While we at it convert the old-style shell quoting into a cleaner form t shut up my editors linter lest it confuse me by underlining the whole line. Suggested-by: Paolo Bonzini Signed-off-by: Alex Benn=C3=A9e Tested-by: Thomas Huth Reviewed-by: Eric Blake --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index e85d6baf8f..432b83fadf 100755 --- a/configure +++ b/configure @@ -198,8 +198,8 @@ has() { } =20 version_ge () { - local_ver1=3D`echo $1 | tr . ' '` - local_ver2=3D`echo $2 | tr . ' '` + local_ver1=3D$(expr "$1" : '\([0-9.]*\)' | tr . ' ') + local_ver2=3D$(echo "$2" | tr . ' ') while true; do set x $local_ver1 local_first=3D${2-0} --=20 2.20.1 From nobody Wed May 22 01:42:36 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1612273860; cv=none; d=zohomail.com; s=zohoarc; b=l2AqJewIOcUA7XH06x0Q/N7exTdr7+Fx2B3KqcZWrJKV97HK4b471OCDc2yygaNOrIIxT+SD+/4NnrZitByx2z/zPQzgJSO1E4ZhHUBqm3o+whHc+wqq0g0g9v93DL/sHIPWA5oP1m2iH3e0P4Cmo7SW51ORTV2jV9rTOXnO4iI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612273860; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vjlUl+V4o4se/GoX88M1i9xAX6ypqCjhOLD5bOI7jyE=; b=eZWSblwxGzwPHJlLgYgUNXWfT96/nANCED0ufylk/3Kjd6E4GCjOczPvM7+TIJpOdCgMZ+g3mezwUUAOfzDGwJudFKHZxDM8WDE9NZc0LtAVSQUCQI1HV93Dy6XKrDoTWHcw5SdyVVg3RH61CmLtDEcmd5MVSyGemqhJlJigRxQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1612273860401823.8851743387345; Tue, 2 Feb 2021 05:51:00 -0800 (PST) Received: from localhost ([::1]:34562 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6w51-0007D7-9H for importer@patchew.org; Tue, 02 Feb 2021 08:50:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57140) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6vul-0003bk-2w for qemu-devel@nongnu.org; Tue, 02 Feb 2021 08:40:19 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:45342) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l6vug-0007Ga-Kv for qemu-devel@nongnu.org; Tue, 02 Feb 2021 08:40:18 -0500 Received: by mail-wr1-x42d.google.com with SMTP id m13so20506185wro.12 for ; Tue, 02 Feb 2021 05:40:14 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y18sm30787517wrt.19.2021.02.02.05.40.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 05:40:07 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C6CE71FF96; Tue, 2 Feb 2021 13:40:01 +0000 (GMT) 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=vjlUl+V4o4se/GoX88M1i9xAX6ypqCjhOLD5bOI7jyE=; b=GO4joYs1H0TdlM/uIWWzkJm1Fk68KtG3LJXDnCU+XrQr27ZQMftbP7fT277r4AbrRF oz/1C2Viwo7X/wWJudpjhPh3upyb0dDvhmPhRfWbRa/t8pbRjYCUhcXtynMMMSeNslT+ iBLie2xggmMNla5uTg5eCRWGuBWuYfGMd6hE+wvwjKJhIiqdpMo/ICAnqf+aoQXUUZ7l JDIsxkzRYa53sPKVx8MAHSDQdXvB+LpCJZFaN2+vb4IyoIpe67xBgzRgYWlry3tET0JF kcZNTIzPu1lvfLoVlZQCaSsucrZIvzgBD6+RJKL49DTIMGf50oHcPBOTTnkcvMLCmiCo r6bg== 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=vjlUl+V4o4se/GoX88M1i9xAX6ypqCjhOLD5bOI7jyE=; b=QoLP3pmqyXET/MIv9+Q4CY+4qlmYe1iwRzBQBCVopn/1bcmecHOCQlX5bun2VUg0s/ Cw8iWsDAmm81zlEKgGIGXbLzcxpRJ1BeaNGDxu8F/b7NtiKl7H47TtJpl+5EXC8rnadW 4+hpR8hG+kvurHZB+0FxAHhXVZYovp6jsvN2jLCfF/Ni2hLjicdvjdhR3oCliUBuaPnB A7BlLSJANxL4rZ+F/tCZuvX7wn1fzkvBJlGGaUupRFpPRXuzuDpnFi3QdEPlS1vDPUbs 6+okGJqIs5uXypKPbf9E6Ds10h+3A5nsLBy2WQEXu/IcBkr5jp2FLi4EB6EOAjNoNRMO NxLg== X-Gm-Message-State: AOAM531lUv5LGX7P6Dl66v627/rmvG61/42ZL84a5Ylq8SZEpKWlT/0z NqDHld8KWUNclaAvnBDumkAB9g== X-Google-Smtp-Source: ABdhPJw0uIpBiwHPPfOOS06bFRjT70uDVHDhiid8OSALh7epox9PMoWx2FppwibR/dwnJJu/cMzVrg== X-Received: by 2002:adf:f9d0:: with SMTP id w16mr23721170wrr.137.1612273213291; Tue, 02 Feb 2021 05:40:13 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 08/15] configure: bump the minimum gdb version for check-tcg to 9.1 Date: Tue, 2 Feb 2021 13:39:53 +0000 Message-Id: <20210202134001.25738-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210202134001.25738-1-alex.bennee@linaro.org> References: <20210202134001.25738-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42d.google.com 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: Luis Machado , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Claudio Fontana Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) For SVE, currently the bulk of the GDB TCG tests, we need at least GDB 9.1 to support the "ieee_half" data type we report. This only affects when GDB tests are run; users can still use lower versions of gdb as long as they aren't talking to an SVE enabled model. The work around is to either get a newer gdb or disable SVE for their CPU model. Reported-by: Claudio Fontana Cc: Luis Machado Signed-off-by: Alex Benn=C3=A9e --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 432b83fadf..6d419aac79 100755 --- a/configure +++ b/configure @@ -6115,7 +6115,7 @@ fi =20 if test -n "$gdb_bin"; then gdb_version=3D$($gdb_bin --version | head -n 1) - if version_ge ${gdb_version##* } 8.3.1; then + if version_ge ${gdb_version##* } 9.1; then echo "HAVE_GDB_BIN=3D$gdb_bin" >> $config_host_mak fi fi --=20 2.20.1 From nobody Wed May 22 01:42:36 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1612273497; cv=none; d=zohomail.com; s=zohoarc; b=kZBm5WYoraQmyjcyFqH1rpnik4KLSomTr4GTpvzNIgoUhujOn3mQnLu1CbSjmGOUGNSA3VS1HYECrdiOQMiea3oVNczGAxYYfJ/Qfy1MIQwuM8rpp93vyskz8huw60OyZlHmcsg6ZtMRpgHIEo+EwseJ4Pf+KVPeto4e9dUdfFI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612273497; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Z+c1gdfURC3gpajhj3DjnSG8qvivfLcnBlGq7OtGWkI=; b=QO4ep73vbzvp2d9HZmihC8tFkPMczAzlAzm5JztouTGo600bwNgn9XyWmmYhsG4A0Yrg1eFu1BhLU3dCr2guZHOhgRKRk2b8BYUo6bRe9FPBDRGTnaC0IE4IZksxniJSa30Rp/2neu7ky6rRl/IH92htHHkc1ZL0VYo6m2Kj07w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1612273497050421.5698952889319; Tue, 2 Feb 2021 05:44:57 -0800 (PST) Received: from localhost ([::1]:46648 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6vzD-00008P-TT for importer@patchew.org; Tue, 02 Feb 2021 08:44:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57180) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6vuo-0003k7-B2 for qemu-devel@nongnu.org; Tue, 02 Feb 2021 08:40:22 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:40823) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l6vul-0007KD-EU for qemu-devel@nongnu.org; Tue, 02 Feb 2021 08:40:22 -0500 Received: by mail-wm1-x331.google.com with SMTP id c127so2330527wmf.5 for ; Tue, 02 Feb 2021 05:40:18 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o14sm30174874wri.48.2021.02.02.05.40.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 05:40:12 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DB39E1FF98; Tue, 2 Feb 2021 13:40:01 +0000 (GMT) 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=Z+c1gdfURC3gpajhj3DjnSG8qvivfLcnBlGq7OtGWkI=; b=YZc3E3kkA2k+bUZVOWnGKn6rbeQOozsFnYxzMg2H1j8O//SE+yq3EprFIR5tEkWdmZ fBASnr5jXaVJBpys7IuDoBUZhk40i1orzXBZt1UezrH5WUm4CA8MPmp2h3OZX48LskvD EBpySlPW7vMWvMPpgrmgPk28v67IiRQJAWqDwgU7pQDgY7vPI9oomVLgFWuqUrgIP6qP lcx9hk/zaVEha6Wqp7j53B3ulnQaty6yFrH++zOnhp9mM5p22j/JxGHDhSVSG2S42ub3 EhFXOaKlanh3Ves8Vg2VuVWAs41CrLMyt7WGaamdu82SsY1ite0rnWd8CL2h82m3ewtk rEiQ== 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=Z+c1gdfURC3gpajhj3DjnSG8qvivfLcnBlGq7OtGWkI=; b=Qr+clrcazt1zad2opNhq6HkSp+R2ZOWZmFkkIbue10n3b5J0UcmwyCE/Vw/KQtjPXv iDzRIta4qaraAdO2ERDKYwRF+OxCJeYCw/i6woe5KI1a3NwTO2JHoqPAGaLB5hMtn6IO LHeVcHXZXhF9hgM1pJEu3ktKDBsdxVwTbhF2+nHxSLnTjbNOm8Vj4Pg/3GTQp1vz0v+Y aKyyI+pbNYbkGpAKmWhy2Ch1Dn4q3iNb1LGmDnUeoFs3M2W3BQk9K57nI2VGLM0Oj3gf sp2/qdaO00boNT4KAg5NEOhHpChnTtSeTgrjBG0UsVhwWAvN0k35QLuigMrCgX7LBFLf 7Dkg== X-Gm-Message-State: AOAM533qefpz0Zf7cvl1n9adEl2By3SYScPZk7vCF3Iut9XxBrYzNwxs Jx/WcZ1zWgza8jR6eBnf6HtvVQ== X-Google-Smtp-Source: ABdhPJwxIjRNKtT1J42YA+nhRzy9vx0+RwzyT3KTyUfKi/yumi8OCodyA8RAgNMG5AOqS/6to3lvZg== X-Received: by 2002:a1c:4303:: with SMTP id q3mr3710189wma.3.1612273217890; Tue, 02 Feb 2021 05:40:17 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 09/15] tests/tcg: don't silently skip the gdb tests Date: Tue, 2 Feb 2021 13:39:54 +0000 Message-Id: <20210202134001.25738-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210202134001.25738-1-alex.bennee@linaro.org> References: <20210202134001.25738-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x331.google.com 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=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Otherwise people won't know what they are missing. Signed-off-by: Alex Benn=C3=A9e --- tests/tcg/multiarch/Makefile.target | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/tcg/multiarch/Makefile.target b/tests/tcg/multiarch/Make= file.target index 1dd0f64d23..abbdb2e126 100644 --- a/tests/tcg/multiarch/Makefile.target +++ b/tests/tcg/multiarch/Makefile.target @@ -63,8 +63,11 @@ run-gdbstub-qxfer-auxv-read: sha1 --bin $< --test $(MULTIARCH_SRC)/gdbstub/test-qxfer-auxv-read.py, \ "basic gdbstub qXfer:auxv:read support") =20 -EXTRA_RUNS +=3D run-gdbstub-sha1 run-gdbstub-qxfer-auxv-read +else +run-gdbstub-%: + $(call skip-test, "gdbstub test $*", "need working gdb") endif +EXTRA_RUNS +=3D run-gdbstub-sha1 run-gdbstub-qxfer-auxv-read =20 =20 # Update TESTS --=20 2.20.1 From nobody Wed May 22 01:42:36 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1612273856; cv=none; d=zohomail.com; s=zohoarc; b=Gd1TrNps5M6MEz/fKzKUbKuGGRaGo1JdpgO54SZBmj8soNxC3urek/EQ3ygDY7RyuALf2ozzM2Ct/Xj06vdfFoEGftwfZsgWQ+LDBczvHtWWsAy13bCqeLmO8s3yoy9IeUV3ciBChkA7BqLxExeCh3RibByh03eIqXcfSNpe+zg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612273856; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+V+VHFv4/e/yHtk8Ffju7fS512Ym9qRjG5IowmRiKvg=; b=R01mqcKrRsXqHsX8JCLV5hePiJI9j4k93f5YW9UvHnAZ5++iAat0Z/pwqjXn1X54Vx6hfHQ1ZPxDvplMIHkOizaHuPsG8cQSeme/y0GHkLzEwB/2UMj2pK2W0dyGWYm9S3VckJXFw4LNQ/8yjBTGozB8ba9BhGGx8TueVeJOXlE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1612273856081339.9420374883796; Tue, 2 Feb 2021 05:50:56 -0800 (PST) Received: from localhost ([::1]:34498 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6w50-0007Bd-34 for importer@patchew.org; Tue, 02 Feb 2021 08:50:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57240) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6vuu-0003th-Ew for qemu-devel@nongnu.org; Tue, 02 Feb 2021 08:40:30 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:39536) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l6vuq-0007P4-0f for qemu-devel@nongnu.org; Tue, 02 Feb 2021 08:40:28 -0500 Received: by mail-wr1-x429.google.com with SMTP id a1so20509869wrq.6 for ; Tue, 02 Feb 2021 05:40:23 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id e11sm31550314wrx.14.2021.02.02.05.40.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 05:40:12 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id F1DC21FF99; Tue, 2 Feb 2021 13:40:01 +0000 (GMT) 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=+V+VHFv4/e/yHtk8Ffju7fS512Ym9qRjG5IowmRiKvg=; b=tLmccLwhoY9zNU2Nhb3owS01UuklYoT8j9yIzjt3btvs9bhyOqv7UXg9ZfxkyEgsbD 2Q5Bb1ip2efWobtut0bnbtY13sNLQ8TWvHctKS6abtVDGTWlEiwaxGpLpi8J7mZHmNJ7 kHlyVxvq9tJuyqGU8ZzDz3yLM32s3scENMjG961CeBrt2ieDpyPZuuEi4isVCE/UnVzO WsVgXlwTydl94vXUzCsUmobk8z83p1B3EQa/ju90JwXy1eRjgXc/SAexhiO7vVAmrLU1 5QgxednKckjlywTSdxSP8moy1Jt3a7qdylAbeJRRvMXK4rM2D8nXQYjiVqbVAK/EwMat QzkQ== 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=+V+VHFv4/e/yHtk8Ffju7fS512Ym9qRjG5IowmRiKvg=; b=bL/HcZnedDn7ReeFGHcqqVTQM84yhRcZZA/wn0ByWT2w6i4qORtZKwpOuIBMz8QF3Y sX+WNj4RjvzCIW2WSeY4GzkSly4906p/pVxgPyeWfZKS5UWpzyUGmPxo2W2Ixzrb79P9 EGavl8Ha4d8lNflB/1R0DGRdcERi2HDSg5Ww8j/8F6kD+vG4b99G6XRA07RKatw84hyK GL7sRKtOv/Er+G9jdECxEe9jhtywIhvLMszT02eGGQSSWgaPXlxuCnKJFTcIe7LJXPRg H48Ru8APWOjMS/iGfxAYtZZM7pNHofwYH6zNgna33nkYsub1zHdP7o61TZs9F+pXN/x3 I2RA== X-Gm-Message-State: AOAM533rOmbaCNj2HWdXUYjBMVLPz3dnV+2TfxsLjWZ45oUvTgxvFMS+ wPG5PMdE23pZiRfr7Danry2wwQ== X-Google-Smtp-Source: ABdhPJyJiT+nVY2y8qHKJnTLa2KNpUYGezW6aCAPphfOSdI/fZxL+qTkIoBi97jVJu02DjHFU4ZDcg== X-Received: by 2002:adf:cd10:: with SMTP id w16mr23638564wrm.90.1612273222424; Tue, 02 Feb 2021 05:40:22 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 10/15] gdbstub: Fix handle_query_xfer_auxv Date: Tue, 2 Feb 2021 13:39:55 +0000 Message-Id: <20210202134001.25738-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210202134001.25738-1-alex.bennee@linaro.org> References: <20210202134001.25738-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x429.google.com 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=20Benn=C3=A9e?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Richard Henderson The main problem was that we were treating a guest address as a host address with a mere cast. Use the correct interface for accessing guest memory. Do not allow offset =3D=3D auxv_len, which would result in an empty packet. Fixes: 51c623b0de1 ("gdbstub: add support to Xfer:auxv:read: packet") Signed-off-by: Richard Henderson Signed-off-by: Alex Benn=C3=A9e Message-Id: <20210128201831.534033-1-richard.henderson@linaro.org> --- gdbstub.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/gdbstub.c b/gdbstub.c index c7ca7e9f88..759bb00bcf 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -2245,7 +2245,6 @@ static void handle_query_xfer_auxv(GdbCmdContext *gdb= _ctx, void *user_ctx) { TaskState *ts; unsigned long offset, len, saved_auxv, auxv_len; - const char *mem; =20 if (gdb_ctx->num_params < 2) { put_packet("E22"); @@ -2257,8 +2256,8 @@ static void handle_query_xfer_auxv(GdbCmdContext *gdb= _ctx, void *user_ctx) ts =3D gdbserver_state.c_cpu->opaque; saved_auxv =3D ts->info->saved_auxv; auxv_len =3D ts->info->auxv_len; - mem =3D (const char *)(saved_auxv + offset); - if (offset > auxv_len) { + + if (offset >=3D auxv_len) { put_packet("E00"); return; } @@ -2269,12 +2268,20 @@ static void handle_query_xfer_auxv(GdbCmdContext *g= db_ctx, void *user_ctx) =20 if (len < auxv_len - offset) { g_string_assign(gdbserver_state.str_buf, "m"); - memtox(gdbserver_state.str_buf, mem, len); } else { g_string_assign(gdbserver_state.str_buf, "l"); - memtox(gdbserver_state.str_buf, mem, auxv_len - offset); + len =3D auxv_len - offset; + } + + g_byte_array_set_size(gdbserver_state.mem_buf, len); + if (target_memory_rw_debug(gdbserver_state.g_cpu, saved_auxv + offset, + gdbserver_state.mem_buf->data, len, false))= { + put_packet("E14"); + return; } =20 + memtox(gdbserver_state.str_buf, + (const char *)gdbserver_state.mem_buf->data, len); put_packet_binary(gdbserver_state.str_buf->str, gdbserver_state.str_buf->len, true); } --=20 2.20.1 From nobody Wed May 22 01:42:36 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1612273715; cv=none; d=zohomail.com; s=zohoarc; b=ZKsu4Hj9PctCYteor5jzpM+v5XvpIea1cD2FMR/mvI/Ey8I8JSdhzTLZ5fVpg4ToyRMqlgnv4DGfhYy2e5Zmen7T+Old8UU7TSanEUwqp55TP5gVdLkhBeEaCNJJoJKr2FkH1gM6CN9p+7yXuuGsO03QqqFnpJmKE/zY/Xf/dWM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612273715; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wlWeBHf67ZPSXLHh3ZHd/dyct4POq9RDrDJY+meho6M=; b=aZ9nCD4BBKdwQdlsOJFlaSgbUtSJpVRguEm8uRwzTEK0l+1VXrL4h3V09s3X+atoC54ETXgfzfThIbNETQfyJFK/YepNWurUVPUC3NgJ6X1J10rqKx94QpGFlmqzTiVrgiYuE+MzFcgjrUyc4QRypGMMqkT3m1ESew3gaF5icDM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1612273715409233.75883440325288; Tue, 2 Feb 2021 05:48:35 -0800 (PST) Received: from localhost ([::1]:54364 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6w2j-0003g5-TB for importer@patchew.org; Tue, 02 Feb 2021 08:48:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57184) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6vup-0003lA-10 for qemu-devel@nongnu.org; Tue, 02 Feb 2021 08:40:23 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:38751) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l6vum-0007Kq-5g for qemu-devel@nongnu.org; Tue, 02 Feb 2021 08:40:22 -0500 Received: by mail-wm1-x331.google.com with SMTP id y187so2337537wmd.3 for ; Tue, 02 Feb 2021 05:40:19 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id m12sm3352997wmc.10.2021.02.02.05.40.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 05:40:12 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 110A01FF9A; Tue, 2 Feb 2021 13:40:02 +0000 (GMT) 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=wlWeBHf67ZPSXLHh3ZHd/dyct4POq9RDrDJY+meho6M=; b=cfxkUmySa6ma09z9U2Yy/vrDl9DwW8EmwO4yecLRJxP1lCi0+owL2F0Jz+N1LelOT9 61mSMJ5OAhjGogT7Y0KN0qHM2B0ekkTNpWALpZmkkGzCbXFQyZN5/jfAf226Ao2Z+Aga RvRA6erG8tKeiNN2oRjnDb6lN0W41BNIGvtoIo4Anwczwu5wMg9TYhumCnrm46l2nU2F shYp5sFx1+R8sdXhnr6y3suooXV5mgVqcubzNQH5rN0rzX4fAYWIB7HAqGwoRdQ4Jbpd JciSDAPjxNT7398K+lJyp0QRiwttZKS0QY/SwETbz0Knz0pkY66Z/zXhCPp18JwyKpyO t7gQ== 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=wlWeBHf67ZPSXLHh3ZHd/dyct4POq9RDrDJY+meho6M=; b=D/FCv6PNSrXyHL3ggbBMKrMom+FFknpM5jFVUb6ZvewA+Ffm2VPmAO0tkSR4rQuAV+ klS0l/ExcoHZVqRSfYhZcTkrQ479tHYaEz4WbhXe4cFggJ3Zmg8FGqpfix46C1OFVPrO RcN13hmEJtFMCh7rbb371wZFuN8fDXZEKL8rF/pB+nC6U2fR9wXEzbYiUbv4jYX0T5Ak ZqxgubII4QBV/rrc4EwA09fXUemfpc5zUNyqk9+AyqZEv4CMxnNMfmhei5T+cjm80TX1 uOCefvp5X8l7EjaMeDvaYNFQ3by53XeSnLJKY0TEOloclMGwB+FBjG/XsVGlibg6bcCh agkw== X-Gm-Message-State: AOAM532HbQFtbAUkIZIc6WInG9w5BVDIAQXNtiA8C/MCIyS13kgvGN9x 2T7QDNrLbN5mA/RvdTA/rvnHdQ== X-Google-Smtp-Source: ABdhPJwgRwfN5mdrLq/TcRrK7k9lyOWOyXmDxBMjzsUJvHf5E2ut4/oePrfCiu7FOuYaIBpKcxfsGQ== X-Received: by 2002:a7b:c1d7:: with SMTP id a23mr3718222wmj.149.1612273218872; Tue, 02 Feb 2021 05:40:18 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 11/15] tests/tcg: Replace /bin/true by true (required on macOS) Date: Tue, 2 Feb 2021 13:39:56 +0000 Message-Id: <20210202134001.25738-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210202134001.25738-1-alex.bennee@linaro.org> References: <20210202134001.25738-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x331.google.com 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: Stefan Weil , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Stefan Weil /bin/true is missing on macOS, but simply "true" is available as a shell bu= iltin. Signed-off-by: Stefan Weil Reviewed-by: Peter Maydell Signed-off-by: Alex Benn=C3=A9e Message-Id: <20210128135627.2067003-1-sw@weilnetz.de> Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tests/tcg/Makefile.qemu | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/tcg/Makefile.qemu b/tests/tcg/Makefile.qemu index c096c611a2..a56564660c 100644 --- a/tests/tcg/Makefile.qemu +++ b/tests/tcg/Makefile.qemu @@ -90,11 +90,11 @@ run-guest-tests: guest-tests =20 else guest-tests: - $(call quiet-command, /bin/true, "BUILD", \ + $(call quiet-command, true, "BUILD", \ "$(TARGET) guest-tests SKIPPED") =20 run-guest-tests: - $(call quiet-command, /bin/true, "RUN", \ + $(call quiet-command, true, "RUN", \ "tests for $(TARGET) SKIPPED") endif =20 --=20 2.20.1 From nobody Wed May 22 01:42:36 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1612274015; cv=none; d=zohomail.com; s=zohoarc; b=RllqfMK7zq88x1LCeeURSAsJf4nET/CdOEDmGli0rmOTDJ2CMKdlEhFU64tJJwh3cV9H9kpaC/VBBf4sP0Yk0UW9bb40uHkBIkCAE07gxicluRipRIWpOHbyYakdkdd548n9vFxPzjhTShUNWZyf7wp1R5IHGfpk9R4Ju3P1b6A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612274015; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ryuNxTXwDSUiKM7x6VXFmXXC0IegaYuuOajUh/vALXs=; b=ZZVvgkiwPPOQbSvt31ZS+28ERWugpW04XpOzlQRqncGvK3SJlD7D/0ywbgw2ycLAtDT1WKQLfKh1xlxu4I+iypGYmgWIGm/G6tdnF63dEMPEA+wy+15b+FM3QQ0+7GcsUbV9Nfg3J5ERmHu1VN4akVIOAPS90+5IKUohOl82JPY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16122740151947.817628059132289; Tue, 2 Feb 2021 05:53:35 -0800 (PST) Received: from localhost ([::1]:43076 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6w7a-0002Ui-2E for importer@patchew.org; Tue, 02 Feb 2021 08:53:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57202) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6vuq-0003pI-RE for qemu-devel@nongnu.org; Tue, 02 Feb 2021 08:40:24 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:33532) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l6vun-0007MU-IA for qemu-devel@nongnu.org; Tue, 02 Feb 2021 08:40:24 -0500 Received: by mail-wr1-x42e.google.com with SMTP id 7so20520236wrz.0 for ; Tue, 02 Feb 2021 05:40:21 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id g1sm32160549wrq.30.2021.02.02.05.40.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 05:40:12 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 291F71FF9B; Tue, 2 Feb 2021 13:40:02 +0000 (GMT) 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=ryuNxTXwDSUiKM7x6VXFmXXC0IegaYuuOajUh/vALXs=; b=YrOWF3W8+Qy9oR8z/qozm+KRraHUIw+aDxMV350X8w38caVsFSDNIoW/dQDLqujUga 2ITyC5n8ScAuWEvCNrpBXwm4p5R52fAQy3oG6ogI9J8Jx9c6sbWquWLyOTJOMorMQ54O 7XMtMqwJZqrT+0QzkRbnAN3UoWAwet7WxenTi4fMtFlmI7+FMHwNqdSH6YHG+dvtxwuD O9vshKksI9jRBNVIqIHcUq1tSwTwGPScqXiVQZIgr2oyP9rFtUOdM7U29cnPQuVDsz+W 0WFesRWkRdeh20ZRHx5noh7ZTBpHNtCAsFFlCLqsM7WjbTpVBjUaW5fNXwkBX/LkPWcK LOYg== 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=ryuNxTXwDSUiKM7x6VXFmXXC0IegaYuuOajUh/vALXs=; b=Pf6J7g2VJdQ1D3lPMl3KVei4/PQ26oNCML6JUn8uaDoe0dpuhx9huazfXHIi/SfDiZ Gz2EoaMt6N0zO/HsxTRQiW70o3yqVxZjUs1NoJzdgbPyJw4/iFSsM9TJTCAyr6dlYisL aeRnJluAGop0Al48nGItZRgi73Umxk9t4S3UDOYsJ+oES5p5GZTwMmKJPAmaYkDh0Mvt pLyUTOcRQ6CaaJrIR2Lkd0BuNmptso1osE5FabokG3s4vWRZ2TIuCIxfqONXO9wmb+o4 fAU0BfaCAQ6kq6Mx+eRQWL2OkjSY+qLnRzw2PxDDa2r0yaHNbMAsezuM3i1YVEwRc5D/ J0jg== X-Gm-Message-State: AOAM5317eiU4iCUJiiitqsNMWmNZPrIjRlHf2bvokIPM67QBADBftVYL gsOBTbsU3bDXYknvThTRZtqcng== X-Google-Smtp-Source: ABdhPJyjyXv9+D/c8KbafawCBdcfoAkORmiTIRvQkGQKYWZfxKyCQNgXhAsu+kLM+wbe6C98Q/UtIg== X-Received: by 2002:a5d:55c3:: with SMTP id i3mr23507687wrw.190.1612273220092; Tue, 02 Feb 2021 05:40:20 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 12/15] scripts/mtest2make.py: export all-%s-targets variable and use it Date: Tue, 2 Feb 2021 13:39:57 +0000 Message-Id: <20210202134001.25738-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210202134001.25738-1-alex.bennee@linaro.org> References: <20210202134001.25738-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42e.google.com 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: Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Eduardo Habkost , Cleber Rosa Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) There are some places where the conditional makefile support is the simplest solution. Now we don't expose CONFIG_TCG as a variable create a new one that can be checked for the check-help output. As check-tcg is a PHONY target we re-use check-softfloat to gate that as well. Signed-off-by: Alex Benn=C3=A9e Message-Id: <20210126145356.7860-2-alex.bennee@linaro.org> Acked-by: Paolo Bonzini --- scripts/mtest2make.py | 1 + tests/Makefile.include | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py index 25ee6887cf..cbbcba100d 100644 --- a/scripts/mtest2make.py +++ b/scripts/mtest2make.py @@ -110,6 +110,7 @@ def emit_suite(name, suite, prefix): print('ifneq ($(filter %s %s, $(MAKECMDGOALS)),)' % (target, prefix)) print('.tests +=3D $(.test.$(SPEED).%s)' % (target, )) print('endif') + print('all-%s-targets +=3D %s' % (prefix, target)) =20 targets =3D {t['id']: [os.path.relpath(f) for f in t['filename']] for t in introspect['targets']} diff --git a/tests/Makefile.include b/tests/Makefile.include index ceaf3f0d6e..17dafdfe98 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -12,7 +12,7 @@ check-help: @echo " $(MAKE) check-speed Run qobject speed tests" @echo " $(MAKE) check-qapi-schema Run QAPI schema tests" @echo " $(MAKE) check-block Run block tests" -ifeq ($(CONFIG_TCG),y) +ifneq ($(filter $(all-check-targets), check-softfloat),) @echo " $(MAKE) check-tcg Run TCG tests" @echo " $(MAKE) check-softfloat Run FPU emulation tests" endif --=20 2.20.1 From nobody Wed May 22 01:42:36 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1612273758; cv=none; d=zohomail.com; s=zohoarc; b=cpdF+xlw4Q0nSZLAS7PCLNSf2uWkQOTCnqK2DTBbuP+2zNytdF+n+l+5+Yfyd2/h0aQnc5/xM6zi7cgK0wvBEls+Ho1Je4QmBDlOx7D4im8yH/HZfxPAYmmRysLaqBnxaQr9jOnyByDCAjqJt1a27cTFb11EGLzlZ8gYwzCUz/s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612273758; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=EkuLK63yEXX5SW08QBjGa4Wz+OKzv7+Xm922jA3ia8k=; b=Z2/4h5MgEHb1owtyY4YQkxY1cuZJDo45uB4esdaIMqxiCWZ82hkTIm16M59XIMTqY7EalhOTuVKNztENQg9os+b4Iyp4WiL9K4cGi3s7+dWLn+zM7bjk18jSiQKQx0eRdt3yt9nPe0CgMCAfwoUqKzT1IwgkwNTEfPsFmh1GDTY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1612273758733557.6072091289036; Tue, 2 Feb 2021 05:49:18 -0800 (PST) Received: from localhost ([::1]:57244 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6w3R-0004t2-MF for importer@patchew.org; Tue, 02 Feb 2021 08:49:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57230) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6vus-0003rn-NE for qemu-devel@nongnu.org; Tue, 02 Feb 2021 08:40:26 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:33342) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l6vuq-0007QR-UU for qemu-devel@nongnu.org; Tue, 02 Feb 2021 08:40:26 -0500 Received: by mail-wm1-x32e.google.com with SMTP id a16so1959477wmm.0 for ; Tue, 02 Feb 2021 05:40:24 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c18sm4744430wmk.0.2021.02.02.05.40.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 05:40:15 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3E0851FF9C; Tue, 2 Feb 2021 13:40:02 +0000 (GMT) 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=EkuLK63yEXX5SW08QBjGa4Wz+OKzv7+Xm922jA3ia8k=; b=Ft35cCBGkrqz3Y9sMSNzYiHugOId5lMWmej468fnr9pQxQh9Cjgr2usjNpZiqqvPAw wY2FNxHTYjuVfShKpMtKXRcNDxz3N3CqqIHIuCi6rJXMIpu6uKzYthuHoLsrwU2rMtwV I94qwe6wBBgfeJmjENuYCVyGl8Ql7VqREA1AD+dtMULBVvdMZG2aD9MSjRh+bGxPLcSf DrNefvjcZRoxqwIuAAl04curl8qchfsIXhjp3pSDE3FGMjjTLKJzM3daQ9J0P2YZ4lvk vgWf5sgt/pbnFDDoJ2na9w6VCHIDkJOnqjMU3HwGaLNTF4AVIArC/at/yUjNEAB6zLl6 guQg== 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=EkuLK63yEXX5SW08QBjGa4Wz+OKzv7+Xm922jA3ia8k=; b=aK7vmFFjKade7r5Mu5UbpsQCTj3pnplQnqK66bWqOajnydxDvtKJi023qIG+1f/EhB ljoeW5XL8FR8fk/KWPdU2+b5xNjrXAjMzLnIPbf1YjbxFQNVjE7Z19m5g9oZ8crz6WAN g+GsijVqFLagkyXXz6rEi77yXv4qOFIQrYQZv6XEBHgEfs6jm143ku1JiLCF3BepfbVP 2y+mdf4a8cgtLXLpFegngf5QevvI89yEoFG4Wf+3QUalGlBKnVdvobHyNDSf2Ux6YF/z j8ydF4TWn5g1eW97ThRjKxp9NR2uyY8k0drmzWyenVXEg6K71S4N4d0n+8aiOoum+k9a KtnQ== X-Gm-Message-State: AOAM530LLz+B5w2ey8KAaxA/A/Wg8IwJgz+ejQl+DI9OOsqWs6m3Jw96 gUV5I8MaRgVUwIrcu+hn5sbz0w== X-Google-Smtp-Source: ABdhPJwpLsEUOLomagVBtphOZV6NJl1EsDprqCtb6GSEeyyLgww1LgzGJxlxtIj+h41tZIOTi7+Gsw== X-Received: by 2002:a1c:2ec2:: with SMTP id u185mr3672580wmu.83.1612273223596; Tue, 02 Feb 2021 05:40:23 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 13/15] tests/Makefile.include: don't use TARGET_DIRS for check-tcg Date: Tue, 2 Feb 2021 13:39:58 +0000 Message-Id: <20210202134001.25738-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210202134001.25738-1-alex.bennee@linaro.org> References: <20210202134001.25738-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32e.google.com 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: Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) TARGET_DIRS reflects what we wanted to configure which in the normal case is all our targets. However once meson has pared-down our target list due to missing features we need to check the final list of ninja-targets. This prevents check-tcg barfing on a --disable-tcg build. Suggested-by: Paolo Bonzini Signed-off-by: Alex Benn=C3=A9e Acked-by: Paolo Bonzini Message-Id: <20210126145356.7860-3-alex.bennee@linaro.org> --- v2 - move everything to Makefile.include --- tests/Makefile.include | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 17dafdfe98..d34254fb29 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -40,11 +40,13 @@ SYSEMU_TARGET_LIST :=3D $(subst -softmmu.mak,,$(notdir \ =20 SPEED =3D quick =20 -# Per guest TCG tests +# Build up our target list from the filtered list of ninja targets +TARGETS=3D$(patsubst libqemu-%.fa, %, $(filter libqemu-%.fa, $(ninja-targe= ts))) =20 -BUILD_TCG_TARGET_RULES=3D$(patsubst %,build-tcg-tests-%, $(TARGET_DIRS)) -CLEAN_TCG_TARGET_RULES=3D$(patsubst %,clean-tcg-tests-%, $(TARGET_DIRS)) -RUN_TCG_TARGET_RULES=3D$(patsubst %,run-tcg-tests-%, $(TARGET_DIRS)) +# Per guest TCG tests +BUILD_TCG_TARGET_RULES=3D$(patsubst %,build-tcg-tests-%, $(TARGETS)) +CLEAN_TCG_TARGET_RULES=3D$(patsubst %,clean-tcg-tests-%, $(TARGETS)) +RUN_TCG_TARGET_RULES=3D$(patsubst %,run-tcg-tests-%, $(TARGETS)) =20 # Probe for the Docker Builds needed for each build $(foreach PROBE_TARGET,$(TARGET_DIRS), \ --=20 2.20.1 From nobody Wed May 22 01:42:36 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1612274112; cv=none; d=zohomail.com; s=zohoarc; b=KDVUjV1TkpcKHYjKOza+G3YS+JE9beHdRfH/6M71mu31gqa1MJQa63zlEFAeBpK50V6yZy6Y30nspr7OnPIImLiH4vybOwVtywIQAo84Mh/dWTOGPhsf+XkhjOAZAlXv/b12fufXzw+VUtZ0W4QkmehtmILM+WGt+jukSl1kGhk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612274112; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7t4BNORgy1dae3kq2wXQigCulzaDzMkv3Wc+M7mZQsE=; b=WAxjT4oopJoinci4kO1JeAht7eq7ZjIgGDkiaga05/NvX9GZTbQp2TDbnAS3YMSeSJrjGhcR+p4YCVvv2clSvy87yYwPQmnbIpTuITqwhutWlRHYPiulZnWEEQURcEdcKD6s3tL3likurNLrNtjrg2lbWoAc6iSqjr8OVoA8EHI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1612274112641875.7792665792538; Tue, 2 Feb 2021 05:55:12 -0800 (PST) Received: from localhost ([::1]:48130 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6w97-0004Zy-OV for importer@patchew.org; Tue, 02 Feb 2021 08:55:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59632) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6w3B-0004xW-GO for qemu-devel@nongnu.org; Tue, 02 Feb 2021 08:49:01 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:50521) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l6w38-0002ZT-SQ for qemu-devel@nongnu.org; Tue, 02 Feb 2021 08:49:01 -0500 Received: by mail-wm1-x32f.google.com with SMTP id 190so2538795wmz.0 for ; Tue, 02 Feb 2021 05:48:58 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id m22sm33154710wrh.66.2021.02.02.05.48.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 05:48:55 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 51B8D1FF9D; Tue, 2 Feb 2021 13:40:02 +0000 (GMT) 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=7t4BNORgy1dae3kq2wXQigCulzaDzMkv3Wc+M7mZQsE=; b=eOzdxj2Y6rhe3hsu1m0wFXVhYNMcMwB1fdPniua3PS2ux7Eloeek4n5hRPD70tZCec UDASZt5o63fzVvsWAdRWBAEmnmHoSlEIumulMWx9cXnDar+mipHkh1bK+s/GWSU+njW+ 38++yMvFmAPyE6NFZU4uF6oAqZoFeauUmXXfyFvt2Z1lNIf+IN3Zw37vkvDmgh/oN+jf jVtJWrotmUx6kNssNijst+Px6yeIYN/PbN5D7GkaYlaXOmTixKjhhjD+XTmOUO5ueILp 9gZcC1Y52cM407ZCM/hU25fyOPtQH9WnztOasRJuSko6mFcPxj2GiyR/+95COFX0jbx+ 5N9g== 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=7t4BNORgy1dae3kq2wXQigCulzaDzMkv3Wc+M7mZQsE=; b=dbSA9aVoEKYuTkz1mE0bXeDDE3OGlk2msr3wtJyrHzq1H4ncxgQxavhd5c5z8jzfrH K6MmAqivr3XHOxCDv/qns+6s5aebFrr3RpVXeclbx84YsQuHdIqZOlJh+w4kfnbmzo0W S8WGCbqrPZEM6quGXK2/sEzezbgoQKyoQ0dRvCJwQvo/sUx/1HOupjBx/SU2NF3pJ8kw i3Qm7eVgWQ0g1oNQGN3fM1PMpUwWN591ud/BvmSZwS3z1YUJ9N8Vs6Flr6I0um85cIIg 82sXGjKxk9oGgnpUe1KMu6Rg4svedNUtM70OILgHk+7B2kqKPUnvw/vy+UQuQxEK7jCz 5h5A== X-Gm-Message-State: AOAM533tOFA1OFIuU5/KQ6CfMO6dyZNS34GqZCvwKErx5EQJ+YgtTXOD eCg2ukPsjDqKmv6xtmP5toZtow== X-Google-Smtp-Source: ABdhPJzXUMshn80AGdYrI/g5yE2ba4IzLRZ+m30Byu2P7SirOyzjmQweIzqthIqr3ZnSz0aEn/DN1A== X-Received: by 2002:a7b:c395:: with SMTP id s21mr3725774wmj.97.1612273737494; Tue, 02 Feb 2021 05:48:57 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 14/15] docs/system: document an example vexpress-a15 invocation Date: Tue, 2 Feb 2021 13:39:59 +0000 Message-Id: <20210202134001.25738-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210202134001.25738-1-alex.bennee@linaro.org> References: <20210202134001.25738-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32f.google.com 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=unavailable 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: Anders Roxell , "open list:Versatile Express" , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The wiki and the web are curiously absent of the right runes to boot a vexpress model so I had to work from first principles to work it out. Use the more modern -drive notation so alternative backends can be used (unlike the hardwired -sd mode). Signed-off-by: Alex Benn=C3=A9e Cc: Anders Roxell --- v2 - reword kernel build. --- docs/system/arm/vexpress.rst | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/docs/system/arm/vexpress.rst b/docs/system/arm/vexpress.rst index 7f1bcbef07..3e3839e923 100644 --- a/docs/system/arm/vexpress.rst +++ b/docs/system/arm/vexpress.rst @@ -58,3 +58,31 @@ Other differences between the hardware and the QEMU mode= l: ``vexpress-a15``, and have IRQs from 40 upwards. If a dtb is provided on the command line then QEMU will edit it to include suitable entries describing these transports for the guest. + +Booting a Linux kernel +---------------------- + +Building a current Linux kernel with ``multi_v7_defconfig`` should be +enough to get something running. Nowadays an out-of-tree build is +recommended (and also useful if you build a lot of different targets). +In the following example $BLD points to the build directory and $SRC +points to the root of the Linux source tree. You can drop $SRC if you +are running from there. + +.. code-block:: bash + + $ make O=3D$BLD -C $SRC ARCH=3Darm CROSS_COMPILE=3Darm-linux-gnueabihf- = multi_v7_defconfig + $ make O=3D$BLD -C $SRC ARCH=3Darm CROSS_COMPILE=3Darm-linux-gnueabihf- + +By default you will want to boot your rootfs off the sdcard interface. +Your rootfs will need to be padded to the right size. With a suitable +DTB you could also add devices to the virtio-mmio bus. + +.. code-block:: bash + + $ qemu-system-arm -cpu cortex-a15 -smp 4 -m 4096 \ + -machine type=3Dvexpress-a15 -serial mon:stdio \ + -drive if=3Dsd,driver=3Dfile,filename=3Darmel-rootfs.ext4 \ + -kernel zImage \ + -dtb vexpress-v2p-ca15-tc1.dtb \ + -append "console=3DttyAMA0 root=3D/dev/mmcblk0 ro" --=20 2.20.1 From nobody Wed May 22 01:42:36 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1612273971; cv=none; d=zohomail.com; s=zohoarc; b=H2X33esEDx7RPjuBHvMqhDiJWh9aBVQTu+lk0BEKJYbuzjcRf3eCQnIzpYPm18fkayvX+sW0KV2gG4JaEe2nCCU6XbtmE2KChtBn/hMXIPDk8BhWDyufza4ZrMTQyecmz9ZOTgcbrD2HjeJv4OJw/u/rkmiawQ9xlb8n3QokXAE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612273971; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=eABoWxIu0vBulrtOyOVfFPFiYIEpryeA6wbjtHTgu3I=; b=k9TAQsSA0a3PmMd3QFw9o9J1eNIr53tHk8Gr2jLLC6kXMEtxn5FVBnS6tI3fKzcPdfnUwxqdSoHTNV2ZaYt2rHYTvLzssaJFqNR//mk7vABuP56pyGIvfN/0zw2gF/GC5TW1dr2AFUhzgm80XuHYtwSVcMrsyCJhQ+yQkFQwuyw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1612273971238947.3467617710713; Tue, 2 Feb 2021 05:52:51 -0800 (PST) Received: from localhost ([::1]:39502 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6w6s-00012l-3k for importer@patchew.org; Tue, 02 Feb 2021 08:52:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59620) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6w3A-0004vJ-KD for qemu-devel@nongnu.org; Tue, 02 Feb 2021 08:49:00 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:51504) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l6w37-0002ZB-Vm for qemu-devel@nongnu.org; Tue, 02 Feb 2021 08:49:00 -0500 Received: by mail-wm1-x32c.google.com with SMTP id m2so2538161wmm.1 for ; Tue, 02 Feb 2021 05:48:57 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id i59sm34174101wri.3.2021.02.02.05.48.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 05:48:55 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6741A1FF9E; Tue, 2 Feb 2021 13:40:02 +0000 (GMT) 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=eABoWxIu0vBulrtOyOVfFPFiYIEpryeA6wbjtHTgu3I=; b=Bv3WEnOf9rfFDLxZi1imPL9/Jbn+vh2/w2Kr9ncrvSX2fIfKdLvw4yVNMoV0vrzQDB H4eXaFn7bPqYzC5r7ZcCCHKYDDXigli/Npq4wuhTDCCxQbIPJtclEo7wqWnh26GYGIvR 1gdhi8058V5a1ctag4JDHUqhZqI5zITrscsX7ZBDM/7G34sT96fdeHRgglpK/r9Jdetj MD4m5X/8m88Ain3njioPmKN0MYOXyfD48SPigM/iZ15UKO8Q0jpFSGKq5GhImoO8MqmU GbMm2hycWvmpJ3Jt/S0TNYqnXunkcoAlBCrsQZn6h/23zr8Bz5piFccSDncqeJ6UawXk o0PA== 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=eABoWxIu0vBulrtOyOVfFPFiYIEpryeA6wbjtHTgu3I=; b=YEuQsLzN6nTs6iLxYHGjlbqTbop8+BPD5FqF8YVrA2FPBk9wsgvE4J66Vv98MbOAbz gv3a/iSF/UsNCsExbf5hkWkw4qpa+IWO/xDuFBQKuhlM4lE9+C+zYxBlTx1+NyZw1h49 54sUdSuVW2JAPILvroZ5x0vHv4T+XGTNYjS1jjNk/6sq0EDbnh20HB5Wk4KMjKQ3r72S lJuJ9Hhhregg1z0DG68gjtm33jjDhhlXwUNmkJ4wm9REya5AOdutkav0Xqji7Ctfajo9 7OLu1Nz1abjk0O5XFAdPhP2gcR9xKO/7aDSvC64GfC9/UcK42BEzaVeMZfp4BhVJhcqi 7SQg== X-Gm-Message-State: AOAM533FaaJDHEynn02b2g0YAC0pgaAK2CVR2euBgyAIIRub3HGPkals nwmSmPKSuQE9lEcFU+XR6mR33A== X-Google-Smtp-Source: ABdhPJxkhJ6Wr9ZJv5VCG6fAM5WkvnMYv5GYZkhkyqmeJ5GwbLwRqjw5qw36Y31hUiQNnYdEtFomnw== X-Received: by 2002:a7b:c119:: with SMTP id w25mr3677058wmi.177.1612273736457; Tue, 02 Feb 2021 05:48:56 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 15/15] docs/system: document an example booting the versatilepb machine Date: Tue, 2 Feb 2021 13:40:00 +0000 Message-Id: <20210202134001.25738-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210202134001.25738-1-alex.bennee@linaro.org> References: <20210202134001.25738-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32c.google.com 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=unavailable 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: Anders Roxell , "open list:Versatile PB" , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Aurelien Jarno , Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) There is a bit more out there including Aurelien's excellent write up and older Debian images here: https://www.aurel32.net/info/debian_arm_qemu.php https://people.debian.org/~aurel32/qemu/armel/ However the web is transitory and git is forever so lets add something to the fine manual. Cc: Anders Roxell Cc: Aurelien Jarno Signed-off-by: Alex Benn=C3=A9e --- v2 -reword kernel build --- docs/system/arm/versatile.rst | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/docs/system/arm/versatile.rst b/docs/system/arm/versatile.rst index 51221c30a4..2ae792bac3 100644 --- a/docs/system/arm/versatile.rst +++ b/docs/system/arm/versatile.rst @@ -27,3 +27,37 @@ The Arm Versatile baseboard is emulated with the followi= ng devices: devices. =20 - PL181 MultiMedia Card Interface with SD card. + +Booting a Linux kernel +---------------------- + +Building a current Linux kernel with ``versatile_defconfig`` should be +enough to get something running. Nowadays an out-of-tree build is +recommended (and also useful if you build a lot of different targets). +In the following example $BLD points to the build directory and $SRC +points to the root of the Linux source tree. You can drop $SRC if you +are running from there. + +.. code-block:: bash + + $ make O=3D$BLD -C $SRC ARCH=3Darm CROSS_COMPILE=3Darm-linux-gnueabihf- = versatile_defconfig + $ make O=3D$BLD -C $SRC ARCH=3Darm CROSS_COMPILE=3Darm-linux-gnueabihf- + +You may want to enable some additional modules if you want to boot +something from the SCSI interface:: + + CONFIG_PCI=3Dy + CONFIG_PCI_VERSATILE=3Dy + CONFIG_SCSI=3Dy + CONFIG_SCSI_SYM53C8XX_2=3Dy + +You can then boot with a command line like: + +.. code-block:: bash + + $ qemu-system-arm -machine type=3Dversatilepb \ + -serial mon:stdio \ + -drive if=3Dscsi,driver=3Dfile,filename=3Ddebian-buster-armel-rootfs= .ext4 \ + -kernel zImage \ + -dtb versatile-pb.dtb \ + -append "console=3DttyAMA0 ro root=3D/dev/sda" --=20 2.20.1