From patchwork Mon Feb 8 12:38:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 378591 Delivered-To: patch@linaro.org Received: by 2002:a02:b18a:0:0:0:0:0 with SMTP id t10csp4929093jah; Mon, 8 Feb 2021 10:42:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJxphh6hFd10/2Zi51iR/XBYcoBuvpTgS2JqSW5EaRnPjSS0IiR19gc4O9dJgpDpClGVMCSN X-Received: by 2002:a25:1842:: with SMTP id 63mr26414616yby.238.1612809722067; Mon, 08 Feb 2021 10:42:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612809722; cv=none; d=google.com; s=arc-20160816; b=em69RI7ElNpavTJwLkStCoEOkeX4exGCNJITkyoTzTGMB8TRuBVhPpCMHxkkfAg5v9 mbLExcz9xfbM9uoRKbJFiv4d1s/YJFZo/yQ6wwNG/9Ik05I8lBnY3zVg6phXRwuiYxf9 qV9TtAQYyYKynLS0zHnwQJly7Bep3e0ztdFTPgcX/K9GTA+IvOUnipEMhkUS5K8AGG5i Amd3xEYbzOjLg2FkeCKcLGJUQv15SQ7GCx3+dmG0CbY0pddW/T2f0x03wcKU7REwhTYI lN8IrG/DmqktzTokwB4v7lwR0zaWQFEu2LQ21SAVwbarmWKMaLzK2LZEhxkDpZ4dfVeo PNag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=ntQFxCLhqX7LYRou1Wz22akVKHJlOcWw8jf+IBT/9qc=; b=JDTLlQ/vUKfgygu0+gUUdeZFIYMQXJbwXVYc3cSSklysaVQYw6AynH6ruagif9PheT OgYtw7g5+1XWfJdMr3zrMSn4TP52elf0+U0eFyB9b5K7dzfEyv7ca7umilm+WhHWp8YF BJ4M1LvVTRpwT6jkwFG/Lg2J6XOBZI2tl1356YlrrWdx3DEjT93S2kff+P6D5KuSY6EI Vd/f/GzEAm45B0fErpzLxDQcWyGjf0I3Bc4nZ7AsBzMGQBbDpNyqAtYKaUjbUk7WpAif mIUJcK9VAdHioBt/VDiYCox27c+K5Il860aTpChfvi3KhrIoq4/CaBz1yIWpF1bBBlS4 FS0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=JXBG6MV6; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id h142si7804641ybg.337.2021.02.08.10.42.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 08 Feb 2021 10:42:02 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=JXBG6MV6; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:57312 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9BU1-0004T4-Gx for patch@linaro.org; Mon, 08 Feb 2021 13:42:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33374) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l95pE-0003fy-Em for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:39:39 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:45121) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l95oh-0007i8-Jl for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:39:22 -0500 Received: by mail-wr1-x42e.google.com with SMTP id m13so16850806wro.12 for ; Mon, 08 Feb 2021 04:38:25 -0800 (PST) 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=ntQFxCLhqX7LYRou1Wz22akVKHJlOcWw8jf+IBT/9qc=; b=JXBG6MV6tmFfA/MPN7ceCtEjZAUJ1v/HDZgTZXmCi8W6vGA0KXaKYe+Xpcl1pMz/Zu TWSlo89QyhyR2OhifqhVsdC7gIEZPY4Nx4T6DfiZOgVrK9Lzf5R+PnqxeLh4ZDaSIcgk Vmre0mOoT9qk9cMQh0FCiC8zUQtTcRYa+M+ZDLrHmIiOeCUpZbEeE7zYvLMCMtBCx9fP O2XHbcp9iPeH2GKRnQX2T+y7x2bn/firT6FOp4iSarvT6wI/kybfJzrCopJV/oSS6S+Y TOnDonTq3DA/FBcvcD88HnegXUhXRmQnA8n66Z+5kissD3iyFf2goMXhNdItv3bc2UpV iRig== 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=ntQFxCLhqX7LYRou1Wz22akVKHJlOcWw8jf+IBT/9qc=; b=YZEvHbbYxhDkyByO28BCtXMDbNAtM7dd/3fioiTFZdr+CMwvPScnlrgdqy7nuO+3Sb 9U5lv+d3Dt31yLCM1Tok8h2n8HQ8CVJGlekizBmlgSZ3uXq4V4R9c9wcTcQJHX+w/UQX 0inmMIUjuEhb9iCkXjDKujyhFwD7o/fz6nltwmotos9GNQuZhuk0FmQnTwD0ZAmn0nRR rPPb3HRCkMlMrMkVFnxXpCZHF2AJWKKZDSKdWoO5ijLEHxNbipJGuRpb4pMt83+nBttz OXadZKLHRgYlKgz0sOokicnLqKrt71kH3uY6xZ5dbCqvHyYuQpot8vOR9sv0I8L2wd0n Q0nA== X-Gm-Message-State: AOAM530JQloqzUIjG5cr4pn2bxjhs8uGAjNgZ9FsYnKdbG7hqYp3xZL2 3XCeTmnjOY5huuXBUOhACxBvLg== X-Received: by 2002:adf:f7c5:: with SMTP id a5mr4356572wrq.243.1612787904552; Mon, 08 Feb 2021 04:38:24 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c62sm20088546wme.16.2021.02.08.04.38.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 04:38:22 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CA1231FF87; Mon, 8 Feb 2021 12:38:21 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 01/16] tests/acceptance: Increase the timeout in the replay tests Date: Mon, 8 Feb 2021 12:38:06 +0000 Message-Id: <20210208123821.19818-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210208123821.19818-1-alex.bennee@linaro.org> References: <20210208123821.19818-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42e.google.com X-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: Thomas Huth , Pavel Dovgalyuk , =?utf-8?q?Philippe_Mathi?= =?utf-8?b?ZXUtRGF1ZMOp?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , Pavel Dovgalyuk , Cleber Rosa , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth Our gitlab-CI just showed a failed test_ppc_mac99 since it was apparently killed some few seconds before the test finished. Allow it some more time to complete. Signed-off-by: Thomas Huth Reviewed-by: Wainer dos Santos Moschetta Acked-by: Pavel Dovgalyuk Signed-off-by: Alex Bennée Message-Id: <20210127065222.48650-1-thuth@redhat.com> -- 2.20.1 diff --git a/tests/acceptance/replay_kernel.py b/tests/acceptance/replay_kernel.py index 772633b01d..c1cb862468 100644 --- a/tests/acceptance/replay_kernel.py +++ b/tests/acceptance/replay_kernel.py @@ -31,7 +31,7 @@ class ReplayKernelBase(LinuxKernelTest): terminates. """ - timeout = 90 + timeout = 120 KERNEL_COMMON_COMMAND_LINE = 'printk.time=1 panic=-1 ' def run_vm(self, kernel_path, kernel_command_line, console_pattern, From patchwork Mon Feb 8 12:38:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 378596 Delivered-To: patch@linaro.org Received: by 2002:a02:b18a:0:0:0:0:0 with SMTP id t10csp4940499jah; Mon, 8 Feb 2021 10:58:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJzQeNVJLEQVBVj8lLrSW2uJtg/3t/GcBeA2La4lKxdndr/BnLFkhzs8sRF+XzUToR5rNPj5 X-Received: by 2002:a25:23c6:: with SMTP id j189mr8266007ybj.211.1612810709683; Mon, 08 Feb 2021 10:58:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612810709; cv=none; d=google.com; s=arc-20160816; b=YTfdWteIZA7Bw4uD0wtSAFmIx1/M6TI2JaX46cWSBn49gpUIl4vd/3Lo0QCrSye118 8S3UgNc4fP6OyAgv9sUzJLl3bgNrXKHwnBSXXBkEJhGW/ylS6k6ginp38RcId+aETk8x cafC/neUAAhuQi/Qqp82pzPlb50p/Ur15PstaOg9VbnV9RSm4NCiWqix55UXS2L+/sdd Qsg9H0JjFR5ixTkpj0eDuvwgC5RrRF2oZkg1FQWEzaBP+g2wY2XFodGGVgttcwmoFEpg qAtA223fXaRuy6wzMcwxllBuiHvwNDfqeyQ7dB2ttpRFiQ2zYqhUBnKwYJyQVkog+pYg 9SFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=Yqbd1kuQwaJRIQ4c7pGQEKdHV/g/Is0sgX7tD793D3A=; b=YoJpjMoi1kA++acx1YmiEeJr3F4lXJthtxgB0IDx3QMAlzE15Fj0nv29n7GJT/8xg4 QVZMYtn/Om5F7ayYiRiLWr8toSTp8NAkGGJS5SLUDF0Fh5jUI5gH6YNrarBY/Ajiptey XHM8Q2Qw707/86eLMPWlf8a1dzcWw60OALPbOE+s8AHVlYUiwuwBoW4e8fcSGbbG5J7A nP79UfTLLJlhcO/0lgXosXQGoTypy9L/fI/4tUJi/vq4MPBMmReThQeBfQQ69JCvkH88 ZHKG053olGOTyeTeh0qvoKs16c0hYbqS3adrOZt/uHAVULPQr1YAU7IQFoaJEFjAIuXC 0RBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=DyeOTSOe; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id m77si2019326ybm.391.2021.02.08.10.58.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 08 Feb 2021 10:58:29 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=DyeOTSOe; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:54268 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9Bjx-0007f7-2T for patch@linaro.org; Mon, 08 Feb 2021 13:58:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33280) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l95p3-0003eQ-8j for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:39:28 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:33043) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l95oT-0007iN-0G for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:39:06 -0500 Received: by mail-wr1-x434.google.com with SMTP id 7so16965163wrz.0 for ; Mon, 08 Feb 2021 04:38:28 -0800 (PST) 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=Yqbd1kuQwaJRIQ4c7pGQEKdHV/g/Is0sgX7tD793D3A=; b=DyeOTSOeFQlfdboHaYFuHO054L99u9UvKu2rRke+TPZtJarQEiA0wG13cgwgqmIXaq X7MTSJbguN3TzuPRgPH0zXdNae26WHKDYX51E0/91+1KBsu3Hdy0GaNyySW3Tzd7WDUV XIBHkr7Lh5c77y/20zp3yFSeaXHVUYZVYaKG3eJ4HhJGgTlrtGGuMO4XhCNOWiA179/f lIOXOn9AdAocV30GIE+6jCcjyS61yk7SssUqJCBi+xH+dji+mlWcA6NRNu/XXK+IFajs QblDim/cKTo0hCxVU6XezXjBznu5KGAg7rz87+cTMPOGXG43AGCuHlRjcyDIR9qPZrXj vQow== 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=Yqbd1kuQwaJRIQ4c7pGQEKdHV/g/Is0sgX7tD793D3A=; b=I4QWbYerT0VDhGdQuLTjMLcyKmF4CPQlTbyMfm7bLZOn0niRA6oU0f6CVfElSopN3q MYAj/ePl3CCPM/Lp4V8pUs9LtJOrZXruEkQ2yq2mHVZNBcg+pCv7MuPR4sEn4y21O7Uh eC4V72ALJLDuXarzAY5jWLLmAg1wFoCKO420aIlV9XtMOSLb+Ag09o+y9HMADSXGiBEi OPQK4hK7aClyzOle0AyhGR0T2El+qZcqzcd+Mj25Tzt+VYmCNNs7K+6rwGjPwAElZ9vD AgndIOW/lU7WfGkHHu4InOOiqkVVK6iTJMX0urFjc4DooTEWHZ/6owDZfzIKueV9w4OI XLEg== X-Gm-Message-State: AOAM5338yEeY6HAFa/1JBKKuM6sC5Hd2tOgMYXJemJEsd/gUsmwBnLp/ XS3CHErlOCZHk685G53FLsku+A== X-Received: by 2002:a5d:690b:: with SMTP id t11mr19854538wru.12.1612787906817; Mon, 08 Feb 2021 04:38:26 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id h9sm4475291wrc.94.2021.02.08.04.38.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 04:38:23 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E01791FF8C; Mon, 8 Feb 2021 12:38:21 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 02/16] tests/docker: Fix _get_so_libs() for docker-binfmt-image Date: Mon, 8 Feb 2021 12:38:07 +0000 Message-Id: <20210208123821.19818-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210208123821.19818-1-alex.bennee@linaro.org> References: <20210208123821.19818-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x434.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: Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé 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 = _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é Signed-off-by: Alex Bennée Message-Id: <20210119050149.516910-1-f4bug@amsat.org> Message-Id: <20210202134001.25738-2-alex.bennee@linaro.org> -- 2.20.1 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 = ldd_re.search(line) if search: try: - libs.append(s.group(1)) + libs.append(search.group(1)) except IndexError: pass except subprocess.CalledProcessError: From patchwork Mon Feb 8 12:38:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 378590 Delivered-To: patch@linaro.org Received: by 2002:a02:b18a:0:0:0:0:0 with SMTP id t10csp4926688jah; Mon, 8 Feb 2021 10:38:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJxCB8Frrproesa1WyQ4IXR2ztVEArO4uB7poa7mjbKD5IpWBXt2B3RgmOpLYwDfIZuo2cGV X-Received: by 2002:a25:4204:: with SMTP id p4mr3775917yba.76.1612809487852; Mon, 08 Feb 2021 10:38:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612809487; cv=none; d=google.com; s=arc-20160816; b=jLWjivG990IcpgP378SKiHUlAuLmi5ssRKYEJU8yFkVI/IQcsgR+BgmuMZTGob6uIB aDTkdwT2vrQ90/4NaYM2wUjkATiiXbJflFSlyiq2ykqLbEmOqOzrHJtdqgHwogWxGVJr lxk4BavmHYsiKe0j5artO1PBoHZYWZDkK6lIWnA5lUslInT3ZFrEg2crSlLzx67z5gve g2qs/Iar4+i45WANUu3j445AHGkwTbsSh6GfiolftAMilcg3MM8qRMMNXzlzqNkieN+R 4K+5OORU3uZjuqZbOGoa0uA9xK/LBBGkpkVFo+wO5hi1jIkxsWvTW6Y6Bxh4skLwlrJS Tfzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=69e0vkOf0vuiM1aa1l4UrAX0DX83ZQ+TUhL623hzy0g=; b=o3NvAjV1mjjNbaRLtlfCqw0FfFf5W9CuUH3vWuE41NVZxFL7nrldLpFzzTqXqHs2Jl pcMo2mrweWEoQ39LLKNJhjNi1OeTHSxcYXntqfoURrHp3VMWL99R3XWOBgV6v5Zz06cs 9rGBUPEQ9yKFopjA2wKBke9Wos88Z5QPZ0GTIRexxZAC1iHPWDWH4wjAJsLKLEzKG2qy 60WRdEN3wMBXXEbARecsTDdZl1d163s0Iyr7zz2jUmmo5jaNhsgVfjzy8TkUEsVjPZzV fdabEYMug87RiEw9PgcZTZoO39oRVgYKU1WZDa9RDhcv4zSZhIJhYEYfn4+Ugoo7NFJb Jneg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=f95uW4qr; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id e130si18417748ybf.196.2021.02.08.10.38.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 08 Feb 2021 10:38:07 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=f95uW4qr; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:49706 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9BQF-0000u4-As for patch@linaro.org; Mon, 08 Feb 2021 13:38:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33528) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l95pk-0003jz-AO for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:40:04 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:52735) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l95pO-0007ib-Km for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:40:02 -0500 Received: by mail-wm1-x32d.google.com with SMTP id i5so4393733wmq.2 for ; Mon, 08 Feb 2021 04:38:31 -0800 (PST) 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=69e0vkOf0vuiM1aa1l4UrAX0DX83ZQ+TUhL623hzy0g=; b=f95uW4qrrMR8Mb2n6Sah6GsJwNy+PDqDZaVvA9wau7tqpKhJq5szlH7sDtVOTq3VRP 1rPnqaKnL+Brc0V4hKob86Vk09kwOcq46W+dhsdlB88rReCHX3Vd/GOK3IHcXTKzQx9L CRjc7EOKa6ntC//tYLcI66/97mB+6m0d8XG99eyRQhiVgSBsKunAmNZrfh10XMt3vjd2 vNXeEaOID2VPtY2u6MpKr7gBaNzFvrYa5j7MCsi+7H15ddNKqOD49uUDrFS4gc0bclVH GiU+O0PnLFU0CMwBiDPVOWdG5i8DTtCDWEfYyA3bVOwIqqgc7By8BQzfzWdH/z5XSXNb JU5w== 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=69e0vkOf0vuiM1aa1l4UrAX0DX83ZQ+TUhL623hzy0g=; b=au7A7Lt91cHHofhCDYRrujYLUdNJzmwFdkWwKVe8gO83X9UqjEn89BU8VUtvlIVm8d oKPze28jkwWiwHzsR9U3kg1KGCqkNuaNxCJOLJjHWnYd7sRSMTFINMXWzDyjXCzGJrLC l/v3aCw4Oy8262GqEGo8NMkSQfvw/h4dYpr6LcJe4Y2MV4GybJrv1daLIoPTy5A6aOFd iEwyvR81GcI+KWA60CIhuYgCuQSCPAc3qLe1CeAUkXz026thwGQLV/yPBM5u1vc4G+gH +bi1QdLBw3QW/2DE61+T3HpJq30p0rN3kfCQJX/bAUH3E9cy4bKPRwpx+eeDHzpa1/aH JUOQ== X-Gm-Message-State: AOAM531qEjctM3BhyIMUPRTPt/Vd4hu6l5T/J5MYUIAt8ln/MmB50SiN 8apkMR12h/1RifuLFQwGbrNEOQ== X-Received: by 2002:a1c:67c4:: with SMTP id b187mr14724330wmc.17.1612787908039; Mon, 08 Feb 2021 04:38:28 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n10sm29030792wro.39.2021.02.08.04.38.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 04:38:24 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 022A61FF8F; Mon, 8 Feb 2021 12:38:22 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 03/16] tests/docker: Fix typo in help message Date: Mon, 8 Feb 2021 12:38:08 +0000 Message-Id: <20210208123821.19818-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210208123821.19818-1-alex.bennee@linaro.org> References: <20210208123821.19818-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32d.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: Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé To have the variable properly passed, we need to set it, ie. NOUSER=1. Fix the message displayed by 'make docker'. Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Message-Id: <20210119052120.522069-1-f4bug@amsat.org> Message-Id: <20210202134001.25738-3-alex.bennee@linaro.org> -- 2.20.1 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=1 Enable virtual network interface with default backend.' @echo ' NETWORK=$$BACKEND Enable virtual network interface with $$BACKEND.' - @echo ' NOUSER Define to disable adding current user to containers passwd.' + @echo ' NOUSER=1 Define to disable adding current user to containers passwd.' @echo ' NOCACHE=1 Ignore cache when build images.' @echo ' EXECUTABLE= Include executable in image.' @echo ' EXTRA_FILES=" [... ]"' From patchwork Mon Feb 8 12:38:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 378568 Delivered-To: patch@linaro.org Received: by 2002:a02:b18a:0:0:0:0:0 with SMTP id t10csp4874451jah; Mon, 8 Feb 2021 09:34:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJyo/YB6H/TUQU2EvVa3STkeyLScLgrm0pW1XIIOklRUPBMSmKVktKdM4I718pIsjGlAP2tf X-Received: by 2002:a25:b74c:: with SMTP id e12mr28692343ybm.20.1612805697505; Mon, 08 Feb 2021 09:34:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612805697; cv=none; d=google.com; s=arc-20160816; b=Mbf+nMYSAa/eqycVr8QStwOnh/A/GP1/YpO7UNlUEI8TVGfjt490pwbo4R34h9RNEC XaeLw0u808AI4cfQ32haYMxPXP2QIrWhXMC4MdIX75p3HOAQnxKumdB93GfwUIGGU5jT 9HfE2YKZUvN0WLHSmz7DMeKcvJmqBze+UXSTwJgl+UzgwHeg+DvNOHOycG7HSyScoSlk F1dW3jSXI/72b0ghP72pGSYlvaqXkNem+qCmy2jVNvcZTlCdI/Ba8FS6mk5qqGQv2KyC oYnoDxm+22IapJ8bBtX7QMR7hO1dV4xnOQ2M22KIsxYhGfxnOU92jpBY3Z+HAWZjAsHf wCvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=/C/IeWDEzIaP4F9kXntszm+mIX88m1SsEC/60p2ki5M=; b=uHG6ZMwyjxE+QF+49qDbIv/FMdrGFhosBVZ4bSN2A5JYO3bdyfkiKhXCjT3JmswyV0 9os5Ejyrysan9l7fl1hjXIqz46vnIQQPVnpQ4eC1CUUsLaG74lSygvrDafSetv2BR/Cb WHJdMR6iYzUCI4g5BrjC0qOiCN/Zeh3gA9cppUJurQsoD50poTQekjUyIWUAJFbjewLO J1pSJVWF1PVy0XSvXVe2tg2CqkEPEsk41bVZlHndx78aSxhOCwR3+SmJ11z4PmHV161f yzRypVdyhSkccurIM0/fk9RFbd+hrhcsP5w8kzKB0ULGu2LOaXwNJhbigdRJx+MvkrUL c+Gg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=vPVQrLjs; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k206si2968244ybk.30.2021.02.08.09.34.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 08 Feb 2021 09:34:57 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=vPVQrLjs; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:58032 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9AR6-0006f6-UB for patch@linaro.org; Mon, 08 Feb 2021 12:34:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33304) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l95p9-0003fk-U9 for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:39:30 -0500 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:41949) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l95oh-0007iV-I8 for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:39:12 -0500 Received: by mail-wr1-x433.google.com with SMTP id n6so4078442wrv.8 for ; Mon, 08 Feb 2021 04:38:31 -0800 (PST) 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=/C/IeWDEzIaP4F9kXntszm+mIX88m1SsEC/60p2ki5M=; b=vPVQrLjs6lLkXHYQF/pVoyuIbGP0sf3F5NA13rvPmuxDGiPVNrhIFGFF3moMQeRU+7 I33o5nFtjHScRcBZAG7Xg3RgG3GASwUj83Q8I7BQz9FeR4yh+p+rc/q5K4fj0AjcT+Af UlStFgJi2HEstONwksCOc9k0ZJ1jvjrRAhf0ak8CgxPbxet3UIuOI8keNds+xSQ6JUGq HOi72dGfoLKDEnzU/pt+U/xH4q42B55+n+BmPhIX5a8tQiqmN4t4pufnKUZkpmWBfaty ggpM5tHxJ75kxCERNMbmZLvFgCwcYfHwX1kSThSqWgPtik8n89SZFc0wuQjfq15sVMnY hNsw== 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=/C/IeWDEzIaP4F9kXntszm+mIX88m1SsEC/60p2ki5M=; b=YmP0pFDCq5veYhUV9nFzSqsXeaXqKaIgq+djgN/stSHhtoMVu1NvDKI7e6CQIN1xIk fZDzeiwiqLkJHWnkiyOhONGtpAdqhmeFaJxVKHStPiwEB9RM2LQRLgmUJJRNaU1hgGus tApHIc+a3Sd2WSQFTxOdjQU4obTEYnITGFzy6Bg/u1knjBG1geKEIHtLZ8EeGNuES6F0 xtBxJ+rZ+06JG2G6XLW6I/vjxP2czIjYjiduiNmJkut5CwGoXCYfx9yCLNFt5qf3WPuT C/+llQ1QVDrM7Tsm00AQDtboripBOks76whd08F83vWUb7MPH9jX5c+oAf6nPXWyIcUk fgig== X-Gm-Message-State: AOAM530i2VJsHx16Np80jO0bpEB8oI5U4WCU5Z9v7oQUWA9T6ZM1f4In koNaJYl15N5rUmQj7urYMwWsvg== X-Received: by 2002:adf:d085:: with SMTP id y5mr20183417wrh.41.1612787910014; Mon, 08 Feb 2021 04:38:30 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v11sm14235741wrr.3.2021.02.08.04.38.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 04:38:24 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 193A91FF90; Mon, 8 Feb 2021 12:38:22 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 04/16] tests/docker: make _copy_with_mkdir accept missing files Date: Mon, 8 Feb 2021 12:38:09 +0000 Message-Id: <20210208123821.19818-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210208123821.19818-1-alex.bennee@linaro.org> References: <20210208123821.19818-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x433.google.com X-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: Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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ée Tested-by: Philippe Mathieu-Daudé Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20210202134001.25738-4-alex.bennee@linaro.org> -- 2.20.1 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='.'): pass dest_file = "%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 def _get_so_libs(executable): From patchwork Mon Feb 8 12:38:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 378569 Delivered-To: patch@linaro.org Received: by 2002:a02:b18a:0:0:0:0:0 with SMTP id t10csp4876905jah; Mon, 8 Feb 2021 09:38:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJw2Q/9oLOOwhM4ddAP5K6+JQCp7F4yOJr7Cjvih0ga+sBcDuGEo+5poft5rvm5tQ3c5iJEl X-Received: by 2002:a25:50d:: with SMTP id 13mr6504971ybf.5.1612805898508; Mon, 08 Feb 2021 09:38:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612805898; cv=none; d=google.com; s=arc-20160816; b=rQ8Y/UP4VdFmocizrFIGcxP1gTOACnPkzc42p8vUt3On2WiKwXd6pAPeFzkSXuNiNG /1t7zB5bzGRpfjDdpjvYDFCzIfDRrb0R9lFy0EZsSzu0HygXu9xHdJUGV4sE4lFuvH+i DWl6C388gle2tj+Jh5pkIQkV+sEE9NrdCuxdw1wAOUmVTKIAB13G3ZCWk+Zxd+tQ7/QS 03raQGbg1cTMcJFL/SP4sX87CbL1B3v4wknr9vM1yd1vNvq98nPXWpEIzW1h/KFuh6Dg FHUdD1P+sUc4GbHFNCZcCrn3mfwoN8ayixsahNPa6UONBPGIFyvtQL9DxhIyrAa/V8ZV uy3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=l+elDiMrFXDDD+nT/WQU5kV+TB/XEnR+Ql7bQKLVzgA=; b=N7ziZ63/MH3Su/5vmLeBz5zd4uWeAAGx/+vHDPp1jaIgvXcz+oXWgJt3gjBE43CYzb 4q3ACGzJ7DZV5POOhT5ROob3XwKhuzeNFRZzv9yNKSRAHhRoBQzFRq+cKODCH5npeI1l oDP4pWwYoLkl6eu1gDuCzFJuYUHOYgJuLwtCU9n7HH3FqTET93M2V6utVXi2hfMxysWs 7iMzWNax5r9usI2V9u1jcSPP/BiW2nmxIUEJHMQL0vcHcP6mlt4tt5xK2rGXPF6vi3mM 940B8YIMn8wucTynybbN2+QImV18xwRYGZ3t5tCtPqsLuhyjRfziyTxCbMr74VUhznDr lvCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=MQ8fCs51; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id c62si14527704yba.181.2021.02.08.09.38.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 08 Feb 2021 09:38:18 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=MQ8fCs51; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38248 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9AUL-0001tj-V0 for patch@linaro.org; Mon, 08 Feb 2021 12:38:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33318) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l95pA-0003fr-RN for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:39:32 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:43044) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l95oh-0007ih-Da for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:39:12 -0500 Received: by mail-wr1-x431.google.com with SMTP id z6so16845832wrq.10 for ; Mon, 08 Feb 2021 04:38:32 -0800 (PST) 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=l+elDiMrFXDDD+nT/WQU5kV+TB/XEnR+Ql7bQKLVzgA=; b=MQ8fCs51nGcAi+iPDyRLztZgtd/xph2Vn6AvSxWz2N5wy7Svpnk5sQBW7yUh489NqJ XItKlQl6PVXVFjYmf9khSvzdnV3bULZsrqKFpIdJRP+0D4mIC7EnS4iIxVi4DuWzZkhZ sBZQQR9QjDo6p9fbRoOflZMYLbJHWmx7AvquVSPBFkuD/Xx3OXCIwPEGq7atBjuVHNgV 8Cs6LeA+ek0pe7xruz1dxTM0ROXpWT8tPzsaHtwSEfA11ox1ZSOIrCWR+YCvAN1g1NPF NmiNt95QQFOgj698ddH/qxcklMlS0W6fu7AuwOMDlPpm2e7Z9aC5kuQX4GlDzHpyU/YV T1MA== 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=l+elDiMrFXDDD+nT/WQU5kV+TB/XEnR+Ql7bQKLVzgA=; b=C6bZR21lEctRij+iCxPqq38uDxepCDiK16E9nyBf6gqEAU09O2OJx0L5+4j40FABKx gXki/Pe7QWyLHOQkFn1yJoIbJKSXD2boSabgxWLVtW/mSIu/zNluJ/Rc0PV5z1bD3ydF MKOP/F3oqaQcNooHVBUT7qIQRGeMAmJ6eyxOy7gaHtdUuGWf2qGw/71ysSSUOVF9v1Wb CL0qRHWDJo8/EHOqtQZ7OslXmfwh6WuTHMjKhdiWiST2SO89oi8awNSNvseW92siJjDx ZFKrEQx3dUgcPbaGWtP3XufmpP3YWo5tdClNoS7YU7YoGZaJ/z5ggassVrgdzpIK0Kxd eHbA== X-Gm-Message-State: AOAM5314yhoJkFBthzhzaC9cLIkHY9zNu95QwYxVaIzB0Rr8HlRyKpBI qkk8X4pjUpOhtHMKL/kFAbmYsg== X-Received: by 2002:adf:ea02:: with SMTP id q2mr20058475wrm.25.1612787912106; Mon, 08 Feb 2021 04:38:32 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id r13sm22532595wmh.9.2021.02.08.04.38.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 04:38:26 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 300A21FF91; Mon, 8 Feb 2021 12:38:22 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 05/16] tests/docker: preserve original name when copying libs Date: Mon, 8 Feb 2021 12:38:10 +0000 Message-Id: <20210208123821.19818-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210208123821.19818-1-alex.bennee@linaro.org> References: <20210208123821.19818-1-alex.bennee@linaro.org> MIME-Version: 1.0 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=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: Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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ée Message-Id: <20210202134001.25738-5-alex.bennee@linaro.org> -- 2.20.1 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) -def _copy_with_mkdir(src, root_dir, sub_path='.'): +def _copy_with_mkdir(src, root_dir, sub_path='.', name=None): """Copy src into root_dir, creating sub_path as needed.""" dest_dir = os.path.normpath("%s/%s" % (root_dir, sub_path)) try: @@ -102,7 +102,7 @@ def _copy_with_mkdir(src, root_dir, sub_path='.'): # we can safely ignore already created directories pass - dest_file = "%s/%s" % (dest_dir, os.path.basename(src)) + dest_file = "%s/%s" % (dest_dir, name if name else os.path.basename(src)) 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 = os.path.dirname(l) + name = os.path.basename(l) real_l = os.path.realpath(l) - _copy_with_mkdir(real_l, dest_dir, so_path) + _copy_with_mkdir(real_l, dest_dir, so_path, name) def _check_binfmt_misc(executable): From patchwork Mon Feb 8 12:38:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 378587 Delivered-To: patch@linaro.org Received: by 2002:a02:b18a:0:0:0:0:0 with SMTP id t10csp4922237jah; Mon, 8 Feb 2021 10:32:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJwr9MxzWyF7RLPX9sCAj+H4XzHQOUp8j8bnY53Ql2JGoEsto20nr3tKK+/w+PNRDHLxMoxP X-Received: by 2002:a25:400d:: with SMTP id n13mr28716184yba.163.1612809132111; Mon, 08 Feb 2021 10:32:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612809132; cv=none; d=google.com; s=arc-20160816; b=06Scmmn1PFYXaGHqbVZk0fI/zraHY+w4BvZDLTjO91D9AxT/nEA8HWXzQZStkMB2Lv PbqPqtiJfXQyQ9xeyHu/KfXFeOwIdvO5tCht81XCR4QIhXFlJ+WrO9S+G1T7AhJ1kP/F VwFBXk+JrblxNZo9rDhe4PbzqTUAneaQDZXSWxwPWQiI2pLAzm4+mbtyn9JbsZ4eIRXO 71zi9kEy9SctXv8wswzMQXv8U8mpJrymsk+Foey/dnpTgOqHf2I8k1Dn5e1I5tsSlzxt VicMK9ZUavKmSZOhBvWHQIU42LApAl2JVh4xeuK6pTg+gWihIJSOxVL2NfuE/PvfjoMZ qivA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=ubNATQbmg8iLajRmP4P0Pz9JUdOIhvXA6u0rva7SAvE=; b=R917Ge1sNBCY/xKiP3MSPC5oBTUOC1iGAhHsoNVL2UlN/ImBQxnTBA11qarJf6gwuf IcVUgKZdPekzbU+A6zTXmAzMXEdAFNQjxM061Fq6QH8QdMGdltdfjLRMttehttbxYOCs WI2TvhMS+iOU7FBqq26gcY684aeJKnMAgCGpngVF3UzQWUYL8UI5nBGbLL6Hlgj1cx17 6FY/Yg3tKo+2UHi69vUYRaozAOOrplLmucugApNZyUWVGcn3nOXnQGYpQN6Fi3jFZ9Y9 MLho+iJA8Ieb9Qys+UoUn2G8gnGRoDOEH1Ll7gzqyZy3Z7adqIzZcYU++mOqInDeMDG8 b9Rw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=b+Dyei4y; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id n2si17929192ybo.259.2021.02.08.10.32.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 08 Feb 2021 10:32:12 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=b+Dyei4y; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:32950 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9BKV-00022e-GQ for patch@linaro.org; Mon, 08 Feb 2021 13:32:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33522) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l95pk-0003jm-3l for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:40:04 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:34621) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l95pO-0007jK-Kl for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:39:53 -0500 Received: by mail-wr1-x42b.google.com with SMTP id g10so16944043wrx.1 for ; Mon, 08 Feb 2021 04:38:34 -0800 (PST) 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=ubNATQbmg8iLajRmP4P0Pz9JUdOIhvXA6u0rva7SAvE=; b=b+Dyei4ynkXCJhzfPoJBcTK3PXpDQwCoBWYD8M1PWDopR4kz14QgiQCbGRfcqqT4U0 oDOTWxBub7JLhlzOS/kbMsstDR1szHn3GqB1kiejAzdR1svDKta8YyN9HpYefpa7KPe0 BK596Xj6DSs8qGwkqMr2qcVAe/Uq+qyRCmVTBzTs3HKU8KqUcejR+yFDlGBGCIVHaa8q QaudGjaFw6+jabOyG63yKfuPisSU/ord6/aDwMtdlCEJiRoRjWhBikteVpdE6BohMBI1 XY9h3+xlx6/Ke7C6tKELuNUkca898eyEUuESadHV8Dg17xFWHuK4axW7s6+Cq1SiolDJ hdbQ== 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=ubNATQbmg8iLajRmP4P0Pz9JUdOIhvXA6u0rva7SAvE=; b=SwHb7wXW31vUAe/BodPP+5SO2lyn0B0/0YyG3ZU1rbVL9BqPtPNXKNcKNAks6ZkyVq 06rsI7/GahxKUMoE8ootAMPOdV606Ddq0OUXzL3vq4hzZTRjLrR2HFvUbfFKufsWmx2o xyAJaoYer0PLQLBIHC6MUrBdhpQX3K8joN3j3yILkdNXB7WAcglnYQza18cDMJE/vnrZ OCOUhmIHTaWnPDW8gVi2AmZdM0teB/dLCr97Sn34kdmABYRyl6/PwTbF4UVkLIrSGYme hB0kjsAAYNzg58/jMsVbRzg8+Ade5VOXERkB09mUafnPu+B8DxbtvZmmorOjDe4gdOyD EMCw== X-Gm-Message-State: AOAM533FgonLOW61YLxo08DdCOhW905nbAmIIvuYrYu5NK3hTo8YU6k0 VDzF5t36fnAobYMjcahuSP8vNHg5ccKycD3W X-Received: by 2002:adf:ecc5:: with SMTP id s5mr19180471wro.423.1612787913370; Mon, 08 Feb 2021 04:38:33 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id k15sm20167889wmj.6.2021.02.08.04.38.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 04:38:26 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 487B01FF92; Mon, 8 Feb 2021 12:38:22 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 06/16] tests/docker: alias docker-help target for consistency Date: Mon, 8 Feb 2021 12:38:11 +0000 Message-Id: <20210208123821.19818-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210208123821.19818-1-alex.bennee@linaro.org> References: <20210208123821.19818-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42b.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: Fam Zheng , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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ée Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20210202134001.25738-6-alex.bennee@linaro.org> -- 2.20.1 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 containers) + $(call print-help,docker-help,Help about targets running tests inside containers) $(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 -.PHONY: docker docker-test docker-clean docker-image docker-qemu-src +.PHONY: docker docker-help docker-test docker-clean docker-image docker-qemu-src NULL := SPACE := $(NULL) # @@ -218,6 +218,8 @@ endif @echo ' Specify which container engine to run.' @echo ' REGISTRY=url Cache builds from registry (default:$(DOCKER_REGISTRY))' +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. From patchwork Mon Feb 8 12:38:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 378585 Delivered-To: patch@linaro.org Received: by 2002:a02:b18a:0:0:0:0:0 with SMTP id t10csp4919269jah; Mon, 8 Feb 2021 10:28:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJwnPAtd27b36Tv2Sl558+621K5mXY9Cq0mFUM6l50sDgTtSqBr21K6GecTzcQG7itdN4Tvt X-Received: by 2002:a05:6902:1025:: with SMTP id x5mr26979903ybt.493.1612808889427; Mon, 08 Feb 2021 10:28:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612808889; cv=none; d=google.com; s=arc-20160816; b=MV7KhELDxlJX3IX9NTelbj2hG/EwBMJlba1HEz1VIYTve+wzqNgt5gD+PKKXLHxftp RaMr/cFqLbmWoBEGSd/bZZ4+DMYj+VWUXXImCkN0n5mZDhqnz7sgYAp7x9S8ntvwrcm7 COlM0aik89PTO40TSilbZIAoqjDgLTD5Moh+s/aFVA6ifC5cfTE7SRxG81HnDdGHRrXx RZdui2VKruphwrJ2VT3Txztffh+aIxhEmPru8j6w8qlPe1fxQr30mdj7xSsrb57xbfKi IL242q51fuaFBySDx/Y8GmZYDlGLhEFU1W4SNffWqJ4sH2MldLZmCCOLsxKKctfK5GV2 jjIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=d8SAynJQad14L3Py3XDAFmtolIKvB3ca7JcHt4TgWgo=; b=MRlDfaXo5WV3Lhmm0APwkGxnGBZu5eLxeoPqjJUz/5JgTqsU2PfExOlp3a/Iikz6QO 0BK0bRUXQabMydd1zPDRjGiyNatEUv+hmCcvE56aT25oSaus7peMaJlqtF4iBunfR1el kpAN8rJsumyczbusnqFcdIdLasLp+bLiHk0BPaldWQ3pCr60g0nYx6Sz6aExzL9Wrv0A thw0lAHp1CLxyHfXhNrVmnSDTO+1XAJU2DGTml4B5oKStgE2wQ9NGsGk2ikRZ4uM4Tc4 YydUxabcB347gs5oytqXMZ5amECW1bVzvc+X1U5FQyu8PZDHnD5r2kyKHpC012dQdYG2 +DUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=FtiiTcn+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id e3si18555774ybi.121.2021.02.08.10.28.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 08 Feb 2021 10:28:09 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=FtiiTcn+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:52746 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9BGa-0006o9-Sw for patch@linaro.org; Mon, 08 Feb 2021 13:28:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33316) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l95pA-0003fq-RP for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:39:32 -0500 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:42572) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l95oh-0007jq-Ho for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:39:16 -0500 Received: by mail-wr1-x436.google.com with SMTP id r21so669451wrr.9 for ; Mon, 08 Feb 2021 04:38:41 -0800 (PST) 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=d8SAynJQad14L3Py3XDAFmtolIKvB3ca7JcHt4TgWgo=; b=FtiiTcn+tp0rl6Lf/BbR88impAXsCEEV48lXn6oB8GcCKTcPsRgHa8kNLxW84NSuiV 9+jp/A7ByhcceNuC7caxclfTZVhoDuueH3RBiPwpxgf67YiNSc4PoCdoHkafngOfCSHy 5z36ZBxM5TLVpqRRqDnLCwuk2RUqJq+YAYTvDj89fEq8UhN3mtlFajSf0IdaCn4YrWMw 3/5tZYiz0dOGC1i3p92UxCoiggJ5B6TZQbwPvCGr08CZCqmnpWfAnxmLPNNBUWAmepnu urNv7/LP8yZnvEZc2geA6vH51B8WJHDsnOqXkl1Z4jiftpCLJjnnoEdH5+X8mGj9lLl4 Aafw== 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=d8SAynJQad14L3Py3XDAFmtolIKvB3ca7JcHt4TgWgo=; b=jLd/uYJEX8FowLgWuuOcnHtdnqzl5T1rfZZAsXKxcQumCq+txLmNqWD0olKFMCn/GP c1g3lDRHXSawbAmiE0V1TviwfGzLJJc0kBq3dQWX1OVBtJ3rRaW1rRdis2vAtIYjBGqy CnYdlZ4A8OYdB2P2jeRPA1qFvrpYdz2BQmiawxx0wKWwecvVpKOoKPbb5WsDIHstruL7 YY2/SUHOoXPQq0v2MxMfH92zHl0b4WZEhIjd8Dyf+FJMRDu/VfJWghMtiuJAw07xLhKY o63n9w0mjnRUcS3uHkOsEwPygcWVHmZFj1ZrLeXSMTATl5jQ8Ssa5WK8PqRxDFZQhMAq eUfQ== X-Gm-Message-State: AOAM53379gNCsNwnbyD0eDFXQpOY0CaqnMR/crCQdFWWA278mZYdG116 t9Dq3O6YzEgQNvt76IGlAg1bUA== X-Received: by 2002:adf:bc45:: with SMTP id a5mr11741218wrh.290.1612787920142; Mon, 08 Feb 2021 04:38:40 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id e16sm3769174wrt.36.2021.02.08.04.38.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 04:38:30 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6169F1FF93; Mon, 8 Feb 2021 12:38:22 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 07/16] tests/docker: add a docker-exec-copy-test Date: Mon, 8 Feb 2021 12:38:12 +0000 Message-Id: <20210208123821.19818-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210208123821.19818-1-alex.bennee@linaro.org> References: <20210208123821.19818-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x436.google.com X-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: Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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ée Message-Id: <20210202134001.25738-7-alex.bennee@linaro.org> -- 2.20.1 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 = $(if $(ARCH),$(ARCH),$(shell uname -m)) DOCKER_SUFFIX := .docker DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles # we don't run tests on intermediate images (used as base by another image) -DOCKER_PARTIAL_IMAGES := debian10 debian11 debian-bootstrap +DOCKER_PARTIAL_IMAGES := debian10 debian11 debian-bootstrap empty DOCKER_IMAGES := $(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker)))) DOCKER_TARGETS := $(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")) +# These are test targets +USER_TCG_TARGETS=$(patsubst %-linux-user,qemu-%,$(filter %-linux-user,$(TARGET_DIRS))) +EXEC_COPY_TESTS=$(patsubst %,docker-exec-copy-test-%, $(USER_TCG_TARGETS)) + +$(EXEC_COPY_TESTS): docker-exec-copy-test-%: $(DOCKER_FILES_DIR)/empty.docker + $(call quiet-command, \ + $(DOCKER_SCRIPT) build -t qemu/exec-copy-test-$* -f $< \ + $(if $V,,--quiet) --no-cache \ + --include-executable=$* \ + --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 # 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="""Specify a binary that will be copied to the container together with all its dependent libraries""") + parser.add_argument("--skip-binfmt", + action="store_true", + help="""Skip binfmt entry check (used for testing)""") parser.add_argument("--extra-files", nargs='*', help="""Specify files that will be copied in the Docker image, fulfilling the ADD directive from the @@ -466,7 +469,9 @@ class BuildCommand(SubCommand): docker_dir = tempfile.mkdtemp(prefix="docker_build") # Validate binfmt_misc will work - if args.include_executable: + if args.skip_binfmt: + qpath = args.include_executable + elif args.include_executable: qpath, enabled = _check_binfmt_misc(args.include_executable) if not enabled: return 1 diff --git a/tests/docker/dockerfiles/empty.docker b/tests/docker/dockerfiles/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 . / From patchwork Mon Feb 8 12:38:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 378589 Delivered-To: patch@linaro.org Received: by 2002:a02:b18a:0:0:0:0:0 with SMTP id t10csp4923655jah; Mon, 8 Feb 2021 10:34:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJxSxVF8zMrVq4VSuKEI8bMjqbatYC+eBCjZjCqLfnKt/KTlPokTsP5J8Zu0UE7tmCBEFkp0 X-Received: by 2002:a25:6082:: with SMTP id u124mr8460686ybb.214.1612809249198; Mon, 08 Feb 2021 10:34:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612809249; cv=none; d=google.com; s=arc-20160816; b=EPFTnroBndAkiRu0kp3DOhK4bY+hBcqHh0L2zUF5QUK0WwBRvp1fMA75zGOqjSR3d/ d5XlK1d1QvMftdUm2HdvjJyH9AFGHTZnQL5Q0VXBwiU0gqwX7URXhZS5z4MIpovgoIKs Qbt10S3gsrn3K9DZi+KNLQ+s9n4kNtDEIaz7k6g81fFFOI8I1N5CeObHx+a6LoLa/gBi bwweD1iczcWXRG8iel3t0HoMygk9Bp1YAmh2kpKqvrAklozOIe/S4v50XUM642VPDrWa fpIl4RU9jmyF0PSWCpxOUU9+TqzJrm7D7JTR1WZsLgmZ2D//9ase5m89pphBODghwlEO Z5vQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=RoLaaNadYsRBQ0vAb9s/24y/SZHflLdIOBsYDO7si7Q=; b=PZMbpnU4aDW/CHb3b9mUN40bNkzsfkRpsgHLu/cixF2UTgznCjNbRYYg4SYJzLXnuk GrnQ8xRJpOe4cmNZqe4EE65svoriZelWEeUiLgCysGUkI0Ipj4aieHLtjyANiUqpqaYk BW1952MYl0aTsRoSUtAgHeBryP9GgUtSm2BEQv2d/G7Xbt3QTvjtK8i5CsLW/SeYoX8B hgSBmNH9whXIIqYbymgMcu4NML1p3M4hpAw/2nuLbRgfCY8KoQtm5deMOtlqk8f5Fv6h lJ5wSdzzcbBJctdKkyhm5bJ2jhlpLmyRlwxthN1jgvQhPDS4Pl2o8DhB6pN6f+WnZ2uY rhkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=SFh46pUv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id z184si17578540ybc.57.2021.02.08.10.34.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 08 Feb 2021 10:34:09 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=SFh46pUv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:41380 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9BMO-0005YL-Jr for patch@linaro.org; Mon, 08 Feb 2021 13:34:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33526) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l95pk-0003jy-8R for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:40:04 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:52178) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l95pO-0007jk-L7 for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:40:01 -0500 Received: by mail-wm1-x332.google.com with SMTP id t142so10290400wmt.1 for ; Mon, 08 Feb 2021 04:38:40 -0800 (PST) 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=RoLaaNadYsRBQ0vAb9s/24y/SZHflLdIOBsYDO7si7Q=; b=SFh46pUv8bG11H+AGpkQlYuJrSimUADigf1IARd0lGq/KtAlJjPeDz3REJQpIafiXu Q4dLVSde9LHqlUOuiEsRGiLA/E0X0OGVgH6k9vt5NmZusTMvLw8qiRc8y4GmItwfVhSX d0Dal10C6ekh/IUNbQc2m1Qc4dqPsiDwLPF4tkRH2kKArfXraRmCEIxEZzGNmzArSyrt tY9pcrOPRNZlQ1Yc/LwOBHb1aHjo9P9DcTXR1NtEJ2Bv+RjEP3WuE55USDQuu4gIOQ5y hGwQdOrWYcFot6zAhf+yWu9KTm2p3GaBrMNFSvTPPDvR5IYnBdkXnOtQLyFfF3C/wFSc PKtQ== 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=RoLaaNadYsRBQ0vAb9s/24y/SZHflLdIOBsYDO7si7Q=; b=ZFBXN6+4oSVNJwKsiRj4hxnC2FaKOoUsHf6LXDtkpX6tqXnw+Lj78g8hh/OEhSe7aR 7Qm0B7fuZoBAdzmaRn43Gl+Fsr9w0Bb7IC3m0IvOfF9B7kIygW67jFd+T4uo5AIGMzD2 Nbt47xK9A+DyRyH5R0e7NZbJJHDIY+CBboBivnpQ0cYh92cHYHbo+r17YS+1FkOXLqOO 0EMuybKwhEwoz0d6UNGyBrKmHLDt81uRJsn2G0focUu8Ts6OCLQxMjuryzMoSazEXMoF FVvB9ilPkXd0IEKek/+r/iUDg2VdRYL6bcqT3aGQqVhY548bk1EwX6WjYWTZYbFTMoEh 5QXg== X-Gm-Message-State: AOAM533ZQ6CcGx3pljqyxBb+bx6Yg8K5bqwLcq6xDshUBqk666rA9HZG YanMJr+2t+e1IhO3A34oCSI0CndbZ99cvMYn X-Received: by 2002:a1c:ab57:: with SMTP id u84mr15045031wme.115.1612787918007; Mon, 08 Feb 2021 04:38:38 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id a132sm21159311wmf.42.2021.02.08.04.38.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 04:38:30 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7ACDE1FF96; Mon, 8 Feb 2021 12:38:22 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 08/16] configure: make version_ge more tolerant of shady version input Date: Mon, 8 Feb 2021 12:38:13 +0000 Message-Id: <20210208123821.19818-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210208123821.19818-1-alex.bennee@linaro.org> References: <20210208123821.19818-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x332.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: Paolo Bonzini , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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ée Tested-by: Thomas Huth Reviewed-by: Eric Blake Message-Id: <20210202134001.25738-8-alex.bennee@linaro.org> -- 2.20.1 diff --git a/configure b/configure index a34f91171d..36036aa2f2 100755 --- a/configure +++ b/configure @@ -198,8 +198,8 @@ has() { } version_ge () { - local_ver1=`echo $1 | tr . ' '` - local_ver2=`echo $2 | tr . ' '` + local_ver1=$(expr "$1" : '\([0-9.]*\)' | tr . ' ') + local_ver2=$(echo "$2" | tr . ' ') while true; do set x $local_ver1 local_first=${2-0} From patchwork Mon Feb 8 12:38:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 378594 Delivered-To: patch@linaro.org Received: by 2002:a02:b18a:0:0:0:0:0 with SMTP id t10csp4938814jah; Mon, 8 Feb 2021 10:55:49 -0800 (PST) X-Google-Smtp-Source: ABdhPJwYIk9O8Kz/7tmc345eIbDChYTSqsJbZhfB37t5lDYEI/lA48X/0q+u1NU7dik+hD1OUKsT X-Received: by 2002:a25:b41:: with SMTP id 62mr9017821ybl.34.1612810548929; Mon, 08 Feb 2021 10:55:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612810548; cv=none; d=google.com; s=arc-20160816; b=U5/Az5keSDEY73M0iJhuZaY6zlO2woCBn+hUumQyecNPjuJp7YKgp2A2zRqUSQL/q3 9ljSJjbsoRxxoQ5rFD7APUn0DP4Nc3hzchsErRX+HnUrKqxUELSwweGnCvOTySh2XcDe Jz4hKNl2IRMU5kIxHSggYXomdX3TxgTPApqh5Ui9XIzHOXbPCrjUdTOCEGVnpS/EIsGC v2MQscCbFnR5GmSEMje7He6uWFMlc5Q1vjrUJ1yvYG2ThX7UWBECXr0IIZUx9OHWeCr7 BZs8OIpDJGmRl+9KT2RYUzBlEy536TvOpepacfuub/JB4ANXxWhvEydRkmugSEw12aC9 MiMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=KuHSv4f+eWd3LUAAxodJ01HAzlmeXXXkmri5CwIIPdg=; b=FUxoii6H4+Nk5yYfC70p6BXGqt5oJ9ZoESTBNXc7owcHjmeGOG0LHj6O07PpdScvrY l2Mw783aPcajSjjMR5XLXzkpCloQBalYGhP7XKE0fBhxJpJ4P/iKDNLzlNBWftE/BW/p 7Yk86Ab1G1wW15ydGTvcqkzsqtVxgVK7anwKqIE2r4p7bp3HjZKoUTJ6Xen0UqdXkPka tpnDqUVM8WyAfD8O1RRfDosjxQUvd0NoZ2LE4lWNNNUcYDQ1EZJw1CXGTaZdDetSn/1j UIsrqY0t5rEhj0eeepyzOAgEi+qPg5Fl//LFAEPz1Jzk+JFsZNsuuwEPgYGrBQgaBaNT c4Qw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=wSK6i0wN; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id g35si19354888ybi.33.2021.02.08.10.55.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 08 Feb 2021 10:55:48 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=wSK6i0wN; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:49570 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9BhM-0005Z3-Dn for patch@linaro.org; Mon, 08 Feb 2021 13:55:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33616) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l95q8-0003n0-7U for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:40:30 -0500 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:44313) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l95pQ-0007kf-In for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:40:14 -0500 Received: by mail-wr1-x433.google.com with SMTP id g6so3913306wrs.11 for ; Mon, 08 Feb 2021 04:38:43 -0800 (PST) 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=KuHSv4f+eWd3LUAAxodJ01HAzlmeXXXkmri5CwIIPdg=; b=wSK6i0wNCZ5EbK6m2GCZ5gIyAn7gYssRaNHqR3MdrAANvACeml+jWV19CsBeTSycMi QUQCYuSBBW9tmrfzrnaibyIDe0pTHcxSV4y8uQPyMEEHOqYKGuuKs2fIEUSkpWl5GJGT p+yyPEaEebGyMPdggbO/trzJRGGKTcLpZ3lqVBwINJDKUs5eXAoSkMACja9PFqhtprJq R6JKsk7U0PHAjttQuT+Rc4rDEO3sVbLYKJ2xX1GsCdgr5HHCS6BDgOpKjvcniWSGUS5l PqjP4t1j/uxfZYKmq9E8fOJj5ZbgxIhnvRrFlChX7clus73p/5yxSalg8BupfZK9+o4P S+Cw== 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=KuHSv4f+eWd3LUAAxodJ01HAzlmeXXXkmri5CwIIPdg=; b=Rvn7LmgbeBRy7zOH6gDKTE7jSO7V6Jls6ckfDYne3sAEhWeaK9gBim3rVtAkwR8Nrt qaexMSgmN2qPjUIsfZDuLVl0hEY4lB+hOsPK0weyMtRCmXPxcDQcilU0FSsI8PK2Iecw 9IOAiC6UwkRj3b3O3AkZrTIOxZcBxoQl3wjExyMw+Ee6U1F3SqyjmMNeLps7+uV0QTXm ZDoCxyeDSu8lwXM2erDepQ7IRAHH6hjdoqvI2tPRaqr4rXNty7SnSsUedaaraN1EJ8FZ yRZKPPg05So+m2OzselbFH9e+PiQuSNDbWqZMiFfUiLXf5UoYF2973eJSRUTUutaQQRT zd3A== X-Gm-Message-State: AOAM5320o1hIOJb0mygd/EH3nVHyROp2RN2jMXqf4StZ4mFOGCOx8C/R 5oHrMY2nLyu+YniZl5/g53IqNA== X-Received: by 2002:adf:9e47:: with SMTP id v7mr19368896wre.185.1612787922515; Mon, 08 Feb 2021 04:38:42 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z8sm27763630wrh.83.2021.02.08.04.38.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 04:38:33 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 902B01FF98; Mon, 8 Feb 2021 12:38:22 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 09/16] configure: bump the minimum gdb version for check-tcg to 9.1 Date: Mon, 8 Feb 2021 12:38:14 +0000 Message-Id: <20210208123821.19818-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210208123821.19818-1-alex.bennee@linaro.org> References: <20210208123821.19818-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x433.google.com X-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_Benn=C3=A9e?= , qemu-devel@nongnu.org, Claudio Fontana Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 Signed-off-by: Alex Bennée Cc: Luis Machado Message-Id: <20210202134001.25738-9-alex.bennee@linaro.org> -- 2.20.1 diff --git a/configure b/configure index 36036aa2f2..57813eba7b 100755 --- a/configure +++ b/configure @@ -6115,7 +6115,7 @@ fi if test -n "$gdb_bin"; then gdb_version=$($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=$gdb_bin" >> $config_host_mak fi fi From patchwork Mon Feb 8 12:38:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 378593 Delivered-To: patch@linaro.org Received: by 2002:a02:b18a:0:0:0:0:0 with SMTP id t10csp4937103jah; Mon, 8 Feb 2021 10:53:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJyH36NgPXH+Ezh/cNDsurP6ODuxJXAvNeEDTZPefMUud21m3z2lqa0yme3KUiYt95lDlH1E X-Received: by 2002:a25:9a89:: with SMTP id s9mr26136343ybo.407.1612810387088; Mon, 08 Feb 2021 10:53:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612810387; cv=none; d=google.com; s=arc-20160816; b=Yvs4z0BY+wbcVl1tdnAAVurQE7o0yYOKzQZA6dT0gsCtEfCgapVoim3BdIY/JfVjeo txcBphsCdiFdpmFAyWmHHmAYUawmmaajuC672uY5VzATEzDnm9QAXpDR8i36mcZ/GQcp dIeUhg+6H3uvTOdfol9UYmS9q0F6JyWGbE3t6nPDZ0F4Tfrngc9BtYWfaxlt/djCZpXI nLOD1yr2OmG+/ido6NGllQXdlgGxHVBepgLYG163Zp1XOFzSHah6E9Bj6mCJ9glySO2V ZEGZqXqAGcQln4W0IewnFCxnTHWtFcq8unsUO8+vMZTMNhTGamElGw/VrKDQJ2Scucz/ xqzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=w377RkShWfYVKD5bSJML+f06uux+L2r7mDqZb6Yuoo4=; b=UNVhWIlk0Jx7RWRg6L865hrKrEEk4XEcemOUozfgSOmRPsBH6SV31jnYoi2Halbuyk CezWSzQH3BhiF+LQHNIjHo13zZXcB1ET8ZGiHU855PaYgWQ7h19B+EUvCuP0Slf+tABu T+0bqZv2/BvxHHKppfFfJs4b9PTNx22DbRW6EXneyPyXB2JoQrJr1xGPbKW3/Rufchof JZOiDEAauNyfjEZZi1UrYkhTDn/eTNRFnG0eE5T7vhHpQV11gBWttq3BQOsqQuOOi8Z8 7Lsu9dQzagH4tgQjp/YqYJ09db06v/3sxFGtXIbNfesk07JyASWPXFOSfcA85RC/RmAQ PuGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=SAnp8WD9; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id q202si18900139ybg.286.2021.02.08.10.53.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 08 Feb 2021 10:53:07 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=SAnp8WD9; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:43518 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9Bek-0002fv-J7 for patch@linaro.org; Mon, 08 Feb 2021 13:53:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33542) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l95pk-0003kb-UE for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:40:08 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:36160) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l95pO-0007jX-L6 for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:40:04 -0500 Received: by mail-wm1-x334.google.com with SMTP id i9so13116270wmq.1 for ; Mon, 08 Feb 2021 04:38:40 -0800 (PST) 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=w377RkShWfYVKD5bSJML+f06uux+L2r7mDqZb6Yuoo4=; b=SAnp8WD9hT6AkGAzwTgjyg4A40rKC0LWynko9+cvG3T0aJvIAiKoMY2OEKZpCFld41 GB/sij7w0XRBqHt4pcM8xl5FOH+/YPXt6OGQ9D0IO0jDlIoesVPu2hr2wZbUwYIsX00c lL9mfZxarEm3ky9oMnnQ7Mpx8x6j5kBlu/zZvczGx1A6tCA3Rnb4P4OY/PZp4CJK9Pz+ Q6RlPJo4OGRMRJ+oeScLyvl75V1fbKDL27BBKwkCn78f16ht/1XZ/X2ArORyoVDmmBhX m9njKkLHPdNE+MCyeRT10U+WuR0W5yQ+aDDc2iBn0sdD8cl+vi1/OrcFBUlYvarjfST4 EQbA== 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=w377RkShWfYVKD5bSJML+f06uux+L2r7mDqZb6Yuoo4=; b=Oa/hRaqpBGiXjed2KasD/e33wiXzIrX6/v6+z+k1dRanwdryN2FeCjlv8SueVjm3QQ O+NhdNA9l0WKCUUvRJO0OwxCV+frWTxJOfCWBJooC5dxc1c51W0IE/+rZMrHPdnmmYyh OEtbo3Zefi1OkPPwcGe8oJXPIgFhTWLuXxpDTZ2pscth+TzW3bXf5ghvTPhOyhT3yq4b T4/sb5Nw4ur5PJ0MpMhj/Iu+s6JXsHqfHc4FhvbPxXIb2wBexyBVkhPEauEsQRkj1/Hi uxoLERoqgz9a+FnTryZBVRZNrzz8oi+cAAA3zawV6mFIe38vbMwt5Qet/jDxcr5dNYs2 QXFw== X-Gm-Message-State: AOAM5338S94vmw+Kl+LJA+IBjBl7kT5u5kohSiiDibR1iXCY1Gx6ikOj O9BFcKJFqu3fZURFZGqMN0lK+w== X-Received: by 2002:a1c:de54:: with SMTP id v81mr14563019wmg.181.1612787919073; Mon, 08 Feb 2021 04:38:39 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y83sm20911258wmc.12.2021.02.08.04.38.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 04:38:33 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A474F1FF99; Mon, 8 Feb 2021 12:38:22 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 10/16] tests/tcg: don't silently skip the gdb tests Date: Mon, 8 Feb 2021 12:38:15 +0000 Message-Id: <20210208123821.19818-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210208123821.19818-1-alex.bennee@linaro.org> References: <20210208123821.19818-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x334.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_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Otherwise people won't know what they are missing. Signed-off-by: Alex Bennée Message-Id: <20210202134001.25738-10-alex.bennee@linaro.org> -- 2.20.1 diff --git a/tests/tcg/multiarch/Makefile.target b/tests/tcg/multiarch/Makefile.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") -EXTRA_RUNS += run-gdbstub-sha1 run-gdbstub-qxfer-auxv-read +else +run-gdbstub-%: + $(call skip-test, "gdbstub test $*", "need working gdb") endif +EXTRA_RUNS += run-gdbstub-sha1 run-gdbstub-qxfer-auxv-read # Update TESTS From patchwork Mon Feb 8 12:38:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 378598 Delivered-To: patch@linaro.org Received: by 2002:a02:b18a:0:0:0:0:0 with SMTP id t10csp4948483jah; Mon, 8 Feb 2021 11:08:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJyVRC9814nM4pLg23xQcGTB3xB5GA2BOPOmPQkTFRurA8MB+AxS2bkxZkw/QS2rfes1E50G X-Received: by 2002:a25:3056:: with SMTP id w83mr26324495ybw.504.1612811321184; Mon, 08 Feb 2021 11:08:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612811321; cv=none; d=google.com; s=arc-20160816; b=l/yfYM6X1rnSWVU99DR09PKZ3lQPvRPQpZLe5vIrgnXhittfwbHLLZZwu0De66IBZH F7txMaNlxAQ62yzp5SF1JTAuJvhm8L4v8cuqirDOV6vVrl3F9TLUlehtlkSunAxYnSyV 8cqJ3Co1Rn48jxbJzWIA3nRYQXNXFWxdpA14gvx4WireFL5DT4Lx750q0+/NWZZmZh5c MpaXKEKNkEjX33bfRXFWJXZ3NhomH0jXFJ84vYNfOxN/tVex1kURCXVLg2ep4WVuWaG3 Nc8AAew3w0+i+IdxTNiKlaTv4KJ6verZO3ZVz+ff+G7caZ31N7VRp0R+r9vtAPVYOomT S2tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=NRda7hohv+ORS/AyN1sYb9iTKw761l7PAGPzaaV6iHY=; b=gj8CuZ5ibBnjefaVxw3v58hQ4DNAeF559Bm3F4Bvbp5jdX6nWgfe9BLI0CSdVLImB6 ZFaeAFLXM6mBwTYvd83SsVsa59ydlhIwuixlzRH+djb3SwfWnpq6YVjhveqZSowdKLNU pWyppkmIi6WVCAcr6Vfn2mTMT7TSWUn4tM7flzHCfSXEWpGs/OOn3hA18fdLq0DUBWVG dkG2RnwfMBmxgJE5SXLI5Hk/vKWC7GFfHrTu0G8wasd1wIT17y6ZGhvPcyw899vulfD3 WYpe45rIE6lvZsP2vpGJcQDDeDpt/Q0+CVVvmeVf/LIqEb2yY/PX9RO1JckzkjzMeBUC xVQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=yMc8Tcun; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id e68si18897060ybc.272.2021.02.08.11.08.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 08 Feb 2021 11:08:41 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=yMc8Tcun; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:41804 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9Bto-0007Cm-Kc for patch@linaro.org; Mon, 08 Feb 2021 14:08:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33372) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l95pE-0003fx-EY for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:39:39 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:42565) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l95oi-0007kk-9g for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:39:22 -0500 Received: by mail-wr1-x42e.google.com with SMTP id r21so669687wrr.9 for ; Mon, 08 Feb 2021 04:38:44 -0800 (PST) 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=NRda7hohv+ORS/AyN1sYb9iTKw761l7PAGPzaaV6iHY=; b=yMc8TcunZRgGeRtGNmhWgxR56Jp0jPpdaqo8kGLH1Zf/pId7wXkAQqfmMaKcDsKEAJ v4LOeoXqCGwZyyAUPkrjCAJwwYXM5PvYTZzCqCBXwwZ4Wxms1/UzlAO2Nfo8vB5vv7AW tAJLFkUpTKQMquR0m4j020eRejweGzqALAGVoOvMlfyoz7b7JDuL3oWSOswY3fwVXTTu D5QPbQbrifAjoUvZ0HJdt9TPZCmHUuVEJjsWQFOL7XbUVtCj47JPYfpJ16mhza6fJv7i pN+rZs83IjM9KJANvw6NZYZZCBWxnclDRUv0Nni777lcvafPmW+DKZ9mINF6uQ2D/kQb /nDA== 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=NRda7hohv+ORS/AyN1sYb9iTKw761l7PAGPzaaV6iHY=; b=FD5zX5JZKn8/k2mz5UIIk7UxECqI5gu1CBa5aNFWJrl/jetcOQJcB0J/9YryfoseCw lDeLhRuQO2sTLBkMzeZMekj+J3DklcloDk9sYDc3eD1f+omoS3GUDWvRj2B3vcdWQlsF r4Cw0dxtOywoPzAPzEEK3EayqPo+H6qn8DRRB5LXlb2F9fHZX7XItSioyfDenQ5cedpT ZAbFDAkLuBJ85FYgKYR5mQ8+tigSRGd/fjOipgBRZ/2VYZoDJ/0QZqAYozOAvfBlSLNp NXc6udMq59WmDqRjSYdaTQ4LP9WAJ/+tjQL6MLFWGi8U3EoP3td01/Sq+43gyVpZDAWy N9lQ== X-Gm-Message-State: AOAM533qMjtql+PSl8UFyuAW7ubH0n3/Zl6q1Lx7z8JlpDHzJY8dMq/m vVc/MlitQoRirjMoP/YcKzJjLQ== X-Received: by 2002:a5d:4383:: with SMTP id i3mr19822242wrq.293.1612787923465; Mon, 08 Feb 2021 04:38:43 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id k15sm20168078wmj.6.2021.02.08.04.38.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 04:38:33 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BB9F31FF9A; Mon, 8 Feb 2021 12:38:22 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 11/16] gdbstub: Fix handle_query_xfer_auxv Date: Mon, 8 Feb 2021 12:38:16 +0000 Message-Id: <20210208123821.19818-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210208123821.19818-1-alex.bennee@linaro.org> References: <20210208123821.19818-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42e.google.com X-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: =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , qemu-devel@nongnu.org, =?utf-8?q?Phil?= =?utf-8?q?ippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 == 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ée Message-Id: <20210128201831.534033-1-richard.henderson@linaro.org> Message-Id: <20210202134001.25738-11-alex.bennee@linaro.org> -- 2.20.1 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; 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 = gdbserver_state.c_cpu->opaque; saved_auxv = ts->info->saved_auxv; auxv_len = ts->info->auxv_len; - mem = (const char *)(saved_auxv + offset); - if (offset > auxv_len) { + + if (offset >= auxv_len) { put_packet("E00"); return; } @@ -2269,12 +2268,20 @@ static void handle_query_xfer_auxv(GdbCmdContext *gdb_ctx, void *user_ctx) 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 = 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; } + 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); } From patchwork Mon Feb 8 12:38:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 378597 Delivered-To: patch@linaro.org Received: by 2002:a02:b18a:0:0:0:0:0 with SMTP id t10csp4944225jah; Mon, 8 Feb 2021 11:03:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJw1korMlzLVQZhEGGh6+O5JUNpxUSr4Xuo6LX1hqcG5KJTzSqGMKp3C2icO4IhsilI/LNSZ X-Received: by 2002:a25:ad54:: with SMTP id l20mr29119072ybe.491.1612811002686; Mon, 08 Feb 2021 11:03:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612811002; cv=none; d=google.com; s=arc-20160816; b=0yBDn/1MDXMiiXeKznXMlFky+qljoNByC+E5X7kBHXVmBBMHYsZjeREFZPrIlNw730 IsRd1kBSP7TwT+4nVyFle2QAToiJDgiYVwcHAPeLyGz4PrpnmGiEgCQG9cFnj5aIdJck Qx5pq1tIkbMKSdyyiQVpkO2XiL7DdSSXZV36zK9+eMJQwZKyAuZn03cuPFt5SQ2SaQc6 BblfBVmFnbC4GqyzsYNagLT7un0vVGlOMCb07lWctYTiN176jGNxObNrg1l6Fz9FQqCS FJ0hnuCgxMJUahl/ts76Un60R3scuNsXnw3k2OFoAjhP+I5UY6EV7evbtMbSuZz/wkTU AxuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=fITS/ZIRcyY4uQvc1wHO8nnou5g7xUQ3JpD0PLMi4/A=; b=O40scSwS6+XVPqxg8ySLhzQ7AyxkbouROcMG56YZyRUtiTdBdXOzGRhrnjjRtmpeKU yOQGpXQ2OmHJx+6FMiiCjiHfQAe0gT8mfbRALk543H/ON+8T5X+mPwPMlydfXuYwgTHx VYyXWvWPixkY/3IQHOIgEoYlN20vEKRL58tBHlOlB9b2J3qA9pSvRvzmQ7Uv6ijrXwH5 hGnyyq+FhvxsM66nIC1hRt8slWgPy5XAonJV07D2YSV31KiTsz6RVH5KxAw7hXWhYjGu Jt8wU6XRcdNCN33tXyDQ7Q7iE6/e24VSrdLa+SaMeyqnc5ivirHkpshWhtLn6bE0iUFj D/Jw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="MHpV/F1e"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id q206si19960901ybc.244.2021.02.08.11.03.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 08 Feb 2021 11:03:22 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="MHpV/F1e"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33364 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9Boc-0003Q2-3a for patch@linaro.org; Mon, 08 Feb 2021 14:03:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33270) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l95p2-0003eO-KO for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:39:28 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:39730) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l95oa-0007kv-E1 for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:39:09 -0500 Received: by mail-wr1-x435.google.com with SMTP id h12so633107wrw.6 for ; Mon, 08 Feb 2021 04:38:46 -0800 (PST) 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=fITS/ZIRcyY4uQvc1wHO8nnou5g7xUQ3JpD0PLMi4/A=; b=MHpV/F1e3taQvaVt2aNvhdTx5HWpgcuR3C8AF/6Mlq7sq5DnOX+2bggoMTLvpDHB0N SjiY5PF2doV1Z/ojPhp0VcT5LiTX3mycVzh0pXsVEJngJZ6QeZx7+ZALUYbAofMTM5w9 3btaEzqte6LNAf5rNgWEFmN/naA0df+Halm5PngEb8fJ6KiOs8e0nmNdyFkwNyWJ6s+P ig2cq6/VlCx5SEA/BXnnsAnrRvC4j0reulGDO4TupbNwu3g7IlMNghgnqHwby7kdXN6e uPZ6td9o090GDqYKUL0JJQf0v5W3N/80b/dKZec6V+vVwQMh+RfRC42yzHMnAq7Cr/wQ egqA== 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=fITS/ZIRcyY4uQvc1wHO8nnou5g7xUQ3JpD0PLMi4/A=; b=J1nJ88sJCc5ESDkoRL8DVm7a3whdxko8rlMrcX+s7wFnrm1OTC6Vy7re/F5ntf7yTj QzryEo+kiJk2YFZ47Cm7Gx7071TfDhF4gzhb5YTWNPloVlmoUG1+hJ0AWTeC9vdA1t+T veRs3MRBqdnrIs7GDleG55cRqP31uzfJzqlqccvGF0lwSFQIHn2jEjKxrWeG1OwbMynt WcA87BoOPSCjFw+B0evuqyESe4eejCHurvX/oxwlMWxpeS3xNtOcZRHtgpbKSbo5JJv6 Gsz3S8aayHcnnBxBsvg2IaHO7+XJGGM0J4F89KZdUgUqjnRNi+Bnd+5TwZUcxAgxovE9 xfkA== X-Gm-Message-State: AOAM531X8Siu0yfFnLycx/qjnngHehtU1Zo2PJN7q9/yicTzomA7Ng4u ZVxqy7t02XmnnExwD/RWWe4Olb26NbhEyyHv X-Received: by 2002:a5d:518d:: with SMTP id k13mr11961029wrv.158.1612787925302; Mon, 08 Feb 2021 04:38:45 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id r1sm28306828wrl.95.2021.02.08.04.38.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 04:38:33 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D33571FF9B; Mon, 8 Feb 2021 12:38:22 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 12/16] tests/tcg: Replace /bin/true by true (required on macOS) Date: Mon, 8 Feb 2021 12:38:17 +0000 Message-Id: <20210208123821.19818-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210208123821.19818-1-alex.bennee@linaro.org> References: <20210208123821.19818-1-alex.bennee@linaro.org> MIME-Version: 1.0 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=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: Stefan Weil , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Stefan Weil /bin/true is missing on macOS, but simply "true" is available as a shell builtin. Signed-off-by: Stefan Weil Signed-off-by: Alex Bennée Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20210128135627.2067003-1-sw@weilnetz.de> Message-Id: <20210202134001.25738-12-alex.bennee@linaro.org> -- 2.20.1 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 else guest-tests: - $(call quiet-command, /bin/true, "BUILD", \ + $(call quiet-command, true, "BUILD", \ "$(TARGET) guest-tests SKIPPED") run-guest-tests: - $(call quiet-command, /bin/true, "RUN", \ + $(call quiet-command, true, "RUN", \ "tests for $(TARGET) SKIPPED") endif From patchwork Mon Feb 8 12:38:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 378570 Delivered-To: patch@linaro.org Received: by 2002:a02:b18a:0:0:0:0:0 with SMTP id t10csp4879476jah; Mon, 8 Feb 2021 09:42:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJzsBdz0eNkLm6txLlgLKO3cD8THxsrKyUS70LM3KVSDy1OTvoUgrbPJLVNf7PwN0zOG9U+/ X-Received: by 2002:a25:55c5:: with SMTP id j188mr26305833ybb.455.1612806139280; Mon, 08 Feb 2021 09:42:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612806139; cv=none; d=google.com; s=arc-20160816; b=AjCuZM/ZFCLdE3assVQycRoU3IeJJFlLXbmM+9v9F9irfEiLsKOSylwiUp7Y5wBTsC zabHTdWFuySb5HM+GBuZq6vRqXCjxxUmsDxhHrAwpdGFsgAbItZSIOUVC9Sf7KoHvf76 cjjPbQkyYoKCkrMtDiSvTMvfLJqS7sGOwQnJvjbv4mcc1WpyQ2aFqehxbD4Zql7vOIeg nZC984SsPjpE6JiJdTfk9V3lWJbPM+zBk4C83J3KLxfTnMmh0zFppzuAFClObiUPfWgq 4+phapDp1Vwi0jDFuOvUyJ7myhns0w+r7JCJ6C2/5s8+rHMYRtdpI6YtOsILoSzYuuoZ Nutw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=9FElUemn7vDCwadfEV9vU0VxAeiUTnu6ontpp4bH2YE=; b=n5NG0/oIqyKFBPQAlhpNW6xO7j2uTsRWZNJ7M1rDevyXb3Mkf/bxQEKNNZhfxbxdG5 Dmh0fyCVlBHNhZCuaEyQzrrCR97Tq1i8ZkcJanAoOutyC7mDOx4iwEuwnIIkV+LYrikp kTrQgmEbM/QfzfZm/XehKvOW8195FFXG/CpuGZKyRiKWhy9PTamy5ZE2AMtjxYWvEq3N GrJwkkqaPMZVNPpKAUuVHZfeg5/89U1yk3iMMnLq0BveushVthSaYlyZAlPEfHegha8G wxkuVKjc8xTQi/2wSmKFQf+iN0d0sOJhBNmStP+MX6x0aogkFcR45yOJ53T0DPKsuho9 xDeg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=TSEt0WKf; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id e10si2611743ybr.185.2021.02.08.09.42.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 08 Feb 2021 09:42:19 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=TSEt0WKf; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:46702 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9AYE-0005YR-LS for patch@linaro.org; Mon, 08 Feb 2021 12:42:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33524) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l95pk-0003jn-5Y for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:40:04 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:43051) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l95pO-0007lC-L5 for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:39:52 -0500 Received: by mail-wr1-x435.google.com with SMTP id z6so16846773wrq.10 for ; Mon, 08 Feb 2021 04:38:48 -0800 (PST) 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=9FElUemn7vDCwadfEV9vU0VxAeiUTnu6ontpp4bH2YE=; b=TSEt0WKfL860V+xI8eED0cDdzVTqVO6pGiQDX5nO8GzQ1Rs/ZP2VuIl0xuLfUMhfvI 7W5qFsrQt7DibXY7z0bV7TO9TExJ+uDA4JvT1Gz68S72Mj5zSC65mlIHs4cqGPyjCF+M yYEriNZ/22Gl/oiCKVz5KU9yrIbcWa6TKf5dOWRU78NnDzcDPZX4Pxl+Cgvwu+AKQNKW fZdLuhFhjNnNPoxTEBzJd/FDi7Otcc2u6yIqa5wMYqQY65JTMtPH05JxA/6APhrZQbED EV5yrV1tYZMRVsTsZfpt1fey4DLY7HxlmAjQFf/l8wqeKmf1Y5nkUgJsFtW89oJRs0RO /kgA== 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=9FElUemn7vDCwadfEV9vU0VxAeiUTnu6ontpp4bH2YE=; b=XD6IpI0BjqmJDp8m8LmbpJ67oLNPzTmnsXGqHItNkfUf2u0d6vKbnrv8MsXwN6fbEo 3RvWFlN83VdYx7XdjLjgopTy4BDzNTWSeFU0/BeYbFhBR5/rijQ7X3qCGOswNXuHzgEF tczpI+Hot2qIXqMgqXTmxOwIsGgBaO2oCYY8/YWohjY5BiJqOoleKQJyKrAsplVqYt7E byIEkqdBMxPnRwbv1bi81PjO85u6nQXAVewGSRKFqV8Zp1yT7e1ncHt2ZXBp/80JrN9E Uv2u7dDziRKTjC4WQaHUo6fUnnZ7trPUDEiZLI/P0pKVMKvseu8RKrI5riSy7gdc9SHV JO+Q== X-Gm-Message-State: AOAM532AL4eq1/oSej5GpCqn9wmTrEW0Tx8sdplIvzK6njm/9Rq+ukD0 UOlUzD7j1GfNg1CS4i1uCunA/w== X-Received: by 2002:a5d:4443:: with SMTP id x3mr20464961wrr.409.1612787927285; Mon, 08 Feb 2021 04:38:47 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v11sm14236284wrr.3.2021.02.08.04.38.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 04:38:45 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id EBF0E1FF9C; Mon, 8 Feb 2021 12:38:22 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 13/16] scripts/mtest2make.py: export all-%s-targets variable and use it Date: Mon, 8 Feb 2021 12:38:18 +0000 Message-Id: <20210208123821.19818-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210208123821.19818-1-alex.bennee@linaro.org> References: <20210208123821.19818-1-alex.bennee@linaro.org> MIME-Version: 1.0 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=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: Paolo Bonzini , Cleber Rosa , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Eduardo Habkost Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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ée Acked-by: Paolo Bonzini Message-Id: <20210202134001.25738-13-alex.bennee@linaro.org> -- 2.20.1 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 += $(.test.$(SPEED).%s)' % (target, )) print('endif') + print('all-%s-targets += %s' % (prefix, target)) targets = {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 From patchwork Mon Feb 8 12:38:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 378595 Delivered-To: patch@linaro.org Received: by 2002:a02:b18a:0:0:0:0:0 with SMTP id t10csp4940436jah; Mon, 8 Feb 2021 10:58:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJyKayBpCP2ATnvarUJhDEUcs4YIJpIKEbm7nLJPo3wdKuqdaRE1aTb+4392FPtliejdKhFY X-Received: by 2002:a25:c542:: with SMTP id v63mr30128969ybe.83.1612810703873; Mon, 08 Feb 2021 10:58:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612810703; cv=none; d=google.com; s=arc-20160816; b=MpP8TsdaXPMvYcTsiQuJEDimzo3BcL7XxQnM37A9vYXqANDSzcWPS6LSp4VqaGWLb6 l4XFQ+sZzo9R6MEhroFjb7swZQMdBo57EUrJ4GBeo09oLnyI8kHS3zVKPcukK0fqZWT/ Ie6ZLd22q35XO/vecGjsvJTtjK5xG6yvf9RAF2fDqXV2lAXc4b+c7md2XPb0PgA7CTFt oqGVpiUDUn0eMI/SYJn9sxVflRP5iHcFm4tlHZ/SVk5VPK368lVYzTVAxWhXKCC9GxNB DWYXy3OGIPz4hNPxBbHdeFWWEWuMOfXkMmelcwBEnLILikrVW3BP0Ar6XNmxSn9dSayK oF9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=fZc8/pcIL1JNoWlbKYvFp4P3eVREddnQsSh5KL055gw=; b=hdwEmsacakpVBTKvthwHphVCPI/ObyG+Mp5mKnTpaZjUmGuPV3JSxSI2mRXm8VSkON 7TtuQG9bUEqPo0/eD494R1ileyinh1A33zSNgCmMQCgw8tn2vf0Esp063loDihDWfevb qLen4YdVKql0hGawvG0MPqb5DnSLegHTM6JSKjjl5i7iNZBLPx9N8Hv6RNhHS8W3Wmga 3TqKdC/UMnmy9Cgdis4fTXWtyHfn/xzGyCteg7jHIPd3jbldENJwFQM7zyXBlLo0TXh/ bYnKfneAk6Vc0FHOGUPC9mzb73UAG3uyeBcRKTf8MNNmnR1P3uh2PdpSku7rs6pdqYrp QOIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=aA1o84fq; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f7si17500878ybb.37.2021.02.08.10.58.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 08 Feb 2021 10:58:23 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=aA1o84fq; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:55562 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9Bjr-0008HQ-C9 for patch@linaro.org; Mon, 08 Feb 2021 13:58:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34870) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l95uk-0004Nd-RM for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:45:16 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:39790) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l95uV-0000fL-2R for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:45:07 -0500 Received: by mail-wr1-x42b.google.com with SMTP id h12so658222wrw.6 for ; Mon, 08 Feb 2021 04:44:55 -0800 (PST) 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=fZc8/pcIL1JNoWlbKYvFp4P3eVREddnQsSh5KL055gw=; b=aA1o84fqZycjL2AGaWmi7JYy1jSoYFV0htXgvvJ3d7HrFfFUEEFHGPsTQgqcRoUzLu 9LLF6kGWwZSAXyNFb3e27ZGvyb7aNcucbojGye5dtJPStsbU7DnQHr0bT5GX3VbcMHeN TNEKVrtGGxDMkE34V5hg0PCY4gwsQ+8sazr6JKGGi2oxc/MDim0s5EhFYHU8ia40kVuo RVmhEOjpWRdHsa4ecbdUe+9KqCE0MYWqB95m/hq7fWF+c4pMebQ4/7lQGKfhUnssRe72 Ww2AhW8HOUVWovoeM9VQBVU0H6RkbjY8q1JpMQPkg9cLMAdVHsx/6UM5dZyeLjZ0lhn2 3xCw== 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=fZc8/pcIL1JNoWlbKYvFp4P3eVREddnQsSh5KL055gw=; b=lGqFxM9Pc4QBawJ8r4Z+i45qbYih/Id0GstWAOY8rCCCoucmXAOgOz+iwh1ljNE7ip aP3fFXUHp6vinCDtzg9ZgAZBSWYn0SwWYunzDaWaEMsMOXqO5vkD3XYbVOYFTLXUvMgc aYsGvoqKl3eoYTA6iRImi/XY4L4gRWpycG1qcpFeePi+/rGVg+hXSz8BoJju8RcTDftC rExik0bS1nFCXc3FsZvp+kbc9dMLti/+tIFPXEoITfK8KflVCk5AfvUdXMm7ewUBYk57 iM2iZscVq5OzvrruQqankTP+6oNWK1NCvWBDYqaPni4YyFL0Qg806EkEJ/S8kb3XDRoq sJXw== X-Gm-Message-State: AOAM530Rtz2+RwIfaCBgfkN5gXDqxKc3s0kcz86+mZpeIFXlawXVtE5J cIobtekp3mCKWxMvwAkh9PdglCSf7sbWa6V8 X-Received: by 2002:adf:a59a:: with SMTP id g26mr12483429wrc.271.1612788294766; Mon, 08 Feb 2021 04:44:54 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u10sm19876441wmj.40.2021.02.08.04.44.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 04:44:52 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 105CC1FF9D; Mon, 8 Feb 2021 12:38:23 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 14/16] tests/Makefile.include: don't use TARGET_DIRS for check-tcg Date: Mon, 8 Feb 2021 12:38:19 +0000 Message-Id: <20210208123821.19818-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210208123821.19818-1-alex.bennee@linaro.org> References: <20210208123821.19818-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42b.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_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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ée Acked-by: Paolo Bonzini Message-Id: <20210202134001.25738-14-alex.bennee@linaro.org> -- 2.20.1 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 := $(subst -softmmu.mak,,$(notdir \ SPEED = quick -# Per guest TCG tests +# Build up our target list from the filtered list of ninja targets +TARGETS=$(patsubst libqemu-%.fa, %, $(filter libqemu-%.fa, $(ninja-targets))) -BUILD_TCG_TARGET_RULES=$(patsubst %,build-tcg-tests-%, $(TARGET_DIRS)) -CLEAN_TCG_TARGET_RULES=$(patsubst %,clean-tcg-tests-%, $(TARGET_DIRS)) -RUN_TCG_TARGET_RULES=$(patsubst %,run-tcg-tests-%, $(TARGET_DIRS)) +# Per guest TCG tests +BUILD_TCG_TARGET_RULES=$(patsubst %,build-tcg-tests-%, $(TARGETS)) +CLEAN_TCG_TARGET_RULES=$(patsubst %,clean-tcg-tests-%, $(TARGETS)) +RUN_TCG_TARGET_RULES=$(patsubst %,run-tcg-tests-%, $(TARGETS)) # Probe for the Docker Builds needed for each build $(foreach PROBE_TARGET,$(TARGET_DIRS), \ From patchwork Mon Feb 8 12:38:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 378571 Delivered-To: patch@linaro.org Received: by 2002:a02:b18a:0:0:0:0:0 with SMTP id t10csp4883255jah; Mon, 8 Feb 2021 09:47:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJxSBW0CNYlIYcgU1qY9WlyQjN3d9MZ6GYO0UQEFItV3QUgE/rB9XkDD6TX2jmdcop5t0lVS X-Received: by 2002:a25:ada2:: with SMTP id z34mr28433152ybi.335.1612806471725; Mon, 08 Feb 2021 09:47:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612806471; cv=none; d=google.com; s=arc-20160816; b=Axf9MOR5Jppt7kyzHZMgqdB4iv9+wOVLrvbqglioLhwpkr3DqMkCwQKQYrSGJ4Con2 ghi60LfjzFOCJecXysnZA1cIvIXDcZtjQMacAzrZrnuI+5tIEIvTVpdyc6WSpv/pmsuF KkGXE0nNWhkm548tRH2EVQZoDnDrEGtUYJXBLhbj9TdDJZib2pRtVa8/+RAtXwtZgiuV ZHGovEH8UG8dLHLByPcsOGFtnbr33BmuXlJMizpz5dBTqUjig9NJQ/KcELnfylyQXz28 6YDgKajaVgwQUVYacp3mBcf3SFgJ84Uih6blGgZsuQPrBtgTu019QynK8ucN3ikK1fC0 ZCbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=6bc9E/qj8MVrG1lrbbnDCW0cq4qlP1ZjoNfCdUMbKio=; b=jZYu1gUrDbnQsGRmMZ5/TkYJBcN+MW0OjziVZI0O1YejzvQ2/pUygRR7UwLeFIsgSe 6MZewtCP+P9xDxcq027Uxkk3d4za4Bqzt5KjR0oclJelgHo4Lgpy2wLdOpHH3KQxaeBF 2D0v/f1AluQiOHwC79Fn6C0Q45DREtO0WlpnlqCeDQK4q+Z9z6eO2QjmNrXyAtLdKPLa fUAw32lBvquROA46Vg5Yvw32siMNmI/k99TvFtxLemgU3i4XOILKI021ygKYwnrw/1al Ycz6Pvn1Qob2nz2zwsBX6aDzKCeuHVai8F5b2AH1i1foFsuYUAbMK73dBNs3x9gJXbdJ oG+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="fLQ61n/+"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k71si18052983ybk.215.2021.02.08.09.47.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 08 Feb 2021 09:47:51 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="fLQ61n/+"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:58720 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9Adb-0002fT-6f for patch@linaro.org; Mon, 08 Feb 2021 12:47:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34832) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l95uX-0004M0-Iw for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:45:03 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:34992) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l95uQ-0000eW-9y for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:45:01 -0500 Received: by mail-wr1-x431.google.com with SMTP id l12so16970290wry.2 for ; Mon, 08 Feb 2021 04:44:53 -0800 (PST) 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=6bc9E/qj8MVrG1lrbbnDCW0cq4qlP1ZjoNfCdUMbKio=; b=fLQ61n/+ea7zzB/PphMljhmU63cmAiwMCJDFiLca2nKvdJPeFMxQlEmdpnNCvobsSS ekKH8ye+Ft5X88617gJxZIkmBVjqjEyIilTMx7icOnxMrcyMYqi/R75Zr7HHrUw+Zcw7 hSpdANhvu+r20WxVJjjeOgGs2Q4xN13Y9krbp95Oi1SFQulS4wZP/RrCTVhRuXSobM9x 8bMVq7xMzbPsOv/6aaF2bMlGS0muBGAk/tXKV7qAFtTnhcI/jpxwECDlhZQhibxKFAzv fwFSUtWB6RFKDLH3C5Lxzt9XuY0u72/Df9c21XwGCX33QZQLkSHMFO9sXfkoeYr2gGN5 T6ZA== 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=6bc9E/qj8MVrG1lrbbnDCW0cq4qlP1ZjoNfCdUMbKio=; b=cB9VC1hP03scwcWP+M6ZJY5WQnfpW46SEBkgOK1PDgSakGMcyWJb+fmfOXmLbqn1gh 5SpmByaFJE8jLBPC84LovXDXrVynqSGR7EKfJL/0bwlXD3T9zcrYDgkJOWAE5GcKfym4 UlJniy9tmxr3IXlcWiB/6La99aXmUmREgQp9dOmV+m+cvP9Jw7z1Wr5U+CfuApLMhV+a yPv3hQvfnCq3pxH+cbrh698XJLQ3LeIcidisJAG2tgGTjZEZ4qMM4DhPC61+zJznQrpv 5k+gKdPESoGNHxLcoGj4MUsaiOZJzDe/qHmsF7SlXq1a0jlMsOism8K7NGkmxAgDgQom mwYw== X-Gm-Message-State: AOAM5326tL/57ynEqB8qqvuWRBmjhW4kqYKIssez8I12P6evANz6qCd8 WTgjDIlukoBHolkp77gNowIdY/nmfTa4BsC0 X-Received: by 2002:a05:6000:1547:: with SMTP id 7mr19956836wry.301.1612788292622; Mon, 08 Feb 2021 04:44:52 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c11sm27764528wrs.28.2021.02.08.04.44.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 04:44:50 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2737B1FF9E; Mon, 8 Feb 2021 12:38:23 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 15/16] docs/system: document an example vexpress-a15 invocation Date: Mon, 8 Feb 2021 12:38:20 +0000 Message-Id: <20210208123821.19818-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210208123821.19818-1-alex.bennee@linaro.org> References: <20210208123821.19818-1-alex.bennee@linaro.org> MIME-Version: 1.0 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: Anders Roxell , "open list:Versatile Express" , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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ée Cc: Anders Roxell Message-Id: <20210202134001.25738-15-alex.bennee@linaro.org> -- 2.20.1 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 model: ``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=$BLD -C $SRC ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- multi_v7_defconfig + $ make O=$BLD -C $SRC ARCH=arm CROSS_COMPILE=arm-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=vexpress-a15 -serial mon:stdio \ + -drive if=sd,driver=file,filename=armel-rootfs.ext4 \ + -kernel zImage \ + -dtb vexpress-v2p-ca15-tc1.dtb \ + -append "console=ttyAMA0 root=/dev/mmcblk0 ro" From patchwork Mon Feb 8 12:38:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 378599 Delivered-To: patch@linaro.org Received: by 2002:a02:b18a:0:0:0:0:0 with SMTP id t10csp4958087jah; Mon, 8 Feb 2021 11:22:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJyIGjblDg3oWdAxvgTdnj8ZJ00DgfSiqH4Oy36DyF8m2+59eAaFJlAJbAwJer7hRoXs5TJq X-Received: by 2002:a25:d70b:: with SMTP id o11mr7079295ybg.471.1612812172999; Mon, 08 Feb 2021 11:22:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612812172; cv=none; d=google.com; s=arc-20160816; b=sXd8Cm+L521pSE8AtL0ZAFgpv646Bl3uXrcpPUDTka4cS6h/WYYAkz803VjpmOmgP4 wge8tHpsibbj3C0er0d79sDmFRCOTbmuDz4gawjIOq2VGUHnUS2FT7/4VEQT4Jel4Uez s60Zw1/p5Czq3fmsNq9ldqYcT2CombUUbg/YwJpKTyeZHoT/4v7btt2CDWLr55ZCMPyr D1xGEOjCFgxNvgkJ9F9yQ2n9Pk2gQEhJ6h2CoeShHYt3Y8f5Fk+RFuYoYM36a3nYHSl8 WBAdYmz36i2vK06B2Ykuh02C290OEkx0I9q4M63Xz2yVecU7kTk/mzsHfL3fs8xM+yA/ efWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=rTYVBnC8DeTiikg0oxh33vUffvjFeCYrhhCo0rVxKGM=; b=QxqV02zTuIKISGXszsJrhM8UGm4r85tG4loUo98I7IcXhvaRA692n6W3Nz98XOMIcP ZDLeMh6RJ6rNSYxJ6edY3sVWV/MiDaZyDdCmCx0aADZ2Aiz3t/rHDd3+iHpS8LqmqJBx dCYKrSZsoltq3AJrvUHhCPGXA9qS3o54qNrfUVqmtpGt17duLfpTaloiF/TaMxdDIukD FLKvt/fYpQotjD33tLY1PdHuwyW9WCTSSjiCOODfsmGs7oPKuZEDMqFGFF1h/REmrQIY QoaUjp0yfew10KnSTwOfs7+WGiP8R7CzC8bSzzB35SZfO/wNJYRDqtxzXABwFqaFP72o zFyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Sv6Ff+jI; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id m135si3310580ybf.136.2021.02.08.11.22.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 08 Feb 2021 11:22:52 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Sv6Ff+jI; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:35724 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9C7Y-0008Sn-HA for patch@linaro.org; Mon, 08 Feb 2021 14:22:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34830) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l95uX-0004Lz-GO for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:45:03 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:40993) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l95uQ-0000e7-DR for qemu-devel@nongnu.org; Mon, 08 Feb 2021 07:44:59 -0500 Received: by mail-wr1-x42e.google.com with SMTP id n6so4105148wrv.8 for ; Mon, 08 Feb 2021 04:44:52 -0800 (PST) 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=rTYVBnC8DeTiikg0oxh33vUffvjFeCYrhhCo0rVxKGM=; b=Sv6Ff+jIs8UHD8i8kuRbL+Eb6jMiSVZslttZZkAzq+OGwyjFgLLCAiMtSAWRC09/E2 A6Y4XvRREF5lIN+8gA4wAJtm3SxY1GkcsMFpkhgEK2lm5wr5GsUtWSaxwYXXDiDgdyx8 Zn0c30q36HWRmRGEZMf5RRT/NsSpggW5q9V0Vay+D9Vx4tQvFDVxDSnb780ZVjynDODu CplMnAcKUd+yJzzw/xr2oQInELQ2g76J+I91X3pZzC4+a5+1fjoRZ5wsjcK7qEuntb2S HmJX4cPlxFWoDrb0yZ9zZHZ4/zCXkjA/7+peZ7BJFIloJqB5vlVY3BZO9yfc92rGis5W PlJg== 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=rTYVBnC8DeTiikg0oxh33vUffvjFeCYrhhCo0rVxKGM=; b=p557hcgEh48mwqOxVx+H1sRu+aoDsJ5gEhC7q5Ii0h0jwIVTlLc+aM87T+Sfebqngl 2982S9YKmiWAh2bR7wuLkC9+A6lS9uk5qjudi4JMqO/H2ZCCaqupuqXg83oNBFkYO0pT 75GMFqVZums45nBwqvXlzRiMiGYDvsKuMa8zmC7SXmjwiwgRAnqd50blQlL4OS1hSkOa PUBx/1iLvmm1+yQIXFjG1ZrUmpNWv3lQL7hToZ7yUU3pE/NgRgTGJyzzYUZvv4XSuKCp L7FashbRAk006M/dwAbPmgHoggaxAZbSqKUL9j+KQV4eV/sBdI4RhOALSyfEo+g1Zvii QlLQ== X-Gm-Message-State: AOAM532tWZdKuUA88MVHxUmk6NMZizePSPXmxNa5bjdjVhSyiFa+WVes J/nJh2lFC0cBzU/sKet3VSSOGg== X-Received: by 2002:a5d:4c84:: with SMTP id z4mr19246184wrs.289.1612788291490; Mon, 08 Feb 2021 04:44:51 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id x15sm11738456wro.66.2021.02.08.04.44.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 04:44:50 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3C2DA1FF9F; Mon, 8 Feb 2021 12:38:23 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 16/16] docs/system: document an example booting the versatilepb machine Date: Mon, 8 Feb 2021 12:38:21 +0000 Message-Id: <20210208123821.19818-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210208123821.19818-1-alex.bennee@linaro.org> References: <20210208123821.19818-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42e.google.com X-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_Benn=C3=A9e?= , qemu-devel@nongnu.org, Aurelien Jarno Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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. Signed-off-by: Alex Bennée Cc: Anders Roxell Cc: Aurelien Jarno Message-Id: <20210202134001.25738-16-alex.bennee@linaro.org> -- 2.20.1 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 following devices: devices. - 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=$BLD -C $SRC ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- versatile_defconfig + $ make O=$BLD -C $SRC ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- + +You may want to enable some additional modules if you want to boot +something from the SCSI interface:: + + CONFIG_PCI=y + CONFIG_PCI_VERSATILE=y + CONFIG_SCSI=y + CONFIG_SCSI_SYM53C8XX_2=y + +You can then boot with a command line like: + +.. code-block:: bash + + $ qemu-system-arm -machine type=versatilepb \ + -serial mon:stdio \ + -drive if=scsi,driver=file,filename=debian-buster-armel-rootfs.ext4 \ + -kernel zImage \ + -dtb versatile-pb.dtb \ + -append "console=ttyAMA0 ro root=/dev/sda"