From nobody Wed Nov 19 01:38:25 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1614167457; cv=none; d=zohomail.com; s=zohoarc; b=J5wF//ecIAb/NdzkG3GejzT4g8zwzx0PPV/4eJooDkCJT/y3Hqb5bTE8wguFlgywqE8JhiSNUROfkwP9iLRY3iDscyvmQAtMdgmr3Cg/W6qx5dLkYl/Yykxnbwgttys6WgT3EIlP1/7lUU5ycA0hXgm0mZ90ib71AGw8FfpL8RE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614167457; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=yl9N9f02916jOdl75tlt9hwNyZRHfETE4hJ5ov352dM=; b=M+7mDJVZqvQ3Ul779i6WuZ3cdTJtVLRKwdTMMD/oVI6vd5vZgztoQ7kaVTpGw1J2bkxcnfTNF2Jgwzs1UvBi16cZmEHjvFhdYasQ4DJGrDpXuAXEdlJdeDel+Zsy+Egowx+0K6dQMVYDXEdK7ndnbUTt5ffsm1uKbnWcS3VK3hk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614167457021352.06910178467933; Wed, 24 Feb 2021 03:50:57 -0800 (PST) Received: from localhost ([::1]:60322 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEsgw-000773-Sb for importer@patchew.org; Wed, 24 Feb 2021 06:50:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56124) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEsfe-0005qr-Ps for qemu-devel@nongnu.org; Wed, 24 Feb 2021 06:49:34 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:42868) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lEsfd-0002Tc-37 for qemu-devel@nongnu.org; Wed, 24 Feb 2021 06:49:34 -0500 Received: by mail-wr1-x431.google.com with SMTP id r3so1589311wro.9 for ; Wed, 24 Feb 2021 03:49:32 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z13sm3071189wrh.65.2021.02.24.03.49.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Feb 2021 03:49:27 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 75F0C1FF87; Wed, 24 Feb 2021 11:49:26 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yl9N9f02916jOdl75tlt9hwNyZRHfETE4hJ5ov352dM=; b=CBGfjhb6iZASoXsJ+gzezw1cNHGK19HiG6oS/htS/RrYT7u+1QE47t+X0kOL90YwQe yRAf5HhUAhG4Jo7rVE1zGHnRlyKcBokF6k5dqjqZixd5jqdIjxyIol//uEGPGBX2J61V nM19yqcL5IXCGtzyU/7sdeVB7Av4NV+HrWPOwQMW0zhEz8FFfarWqorKQ/z4Z+mi89LG stXdoTeeOSmWqs5oltfyS05GVtcIigLM+pRww0KVL7sXmSDJuNzsl/usjWD0yLhmqjR4 4xkUdB0EayJ0t+XEPsVGlqTzBmTCkBbZfxUXixIbrhoNuZfijDIvNVvpEF3yKnDTtUNx N+mA== 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=yl9N9f02916jOdl75tlt9hwNyZRHfETE4hJ5ov352dM=; b=t647MpjAPbSH3wUpgRUUHcwTYo4LeUeJrhMcwDkwtXpppgweyEFwGcMffXCBW9nHPN HRI/CmP72cKYaZT2cV0obXcw6sCGFI7G6DjH+gZ4iuHHmqOYQ/FIeyTxaSh4JP0W8cDF 8a6+lrDF2U7Wjjgkm8YLbciryMbms2BBK8np6Qq+pUTh6qrUZ3WnlKAiVqkXN60WD/bI 52vejJaH7VR+WY73V/wPwTfOjuu34UWYIQut+hy9FEAEUu6KwS68fUJznbIQChOoJlLJ YKmBkoausVtYByr8drl6nR0NPmz55nzeCiSvtxe8RoFKgJfLy0acr/YDRwVzhaEVWh7V hwVQ== X-Gm-Message-State: AOAM5314AaGDx2atahwecBqELF5QawDhb0XSq3XqfhignciJmCdUbQAP SB+i1jbIjCLvl+ZungkW0p756g== X-Google-Smtp-Source: ABdhPJxTl1I5jnejUMXz+1Z1HdeVzYuhei9mNRmIfoUXOkstwzL9pP4ywAlPtMjbnBiL1wdwUwc4vQ== X-Received: by 2002:a5d:4705:: with SMTP id y5mr24069032wrq.313.1614167371593; Wed, 24 Feb 2021 03:49:31 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 1/7] meson.build: expose TCG cross compiler information in summary Date: Wed, 24 Feb 2021 11:49:20 +0000 Message-Id: <20210224114926.6303-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210224114926.6303-1-alex.bennee@linaro.org> References: <20210224114926.6303-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Blink and you miss the cross TCG compiler stuff so lets display it with the rest of the compiler information. Signed-off-by: Alex Benn=C3=A9e Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Acked-by: Paolo Bonzini Message-Id: <20210222101455.12640-2-alex.bennee@linaro.org> diff --git a/meson.build b/meson.build index 05a67c20d9..f3db83e974 100644 --- a/meson.build +++ b/meson.build @@ -2509,6 +2509,24 @@ endif summary_info +=3D {'strip binaries': get_option('strip')} summary_info +=3D {'sparse': sparse.found() ? sparse.full_path(= ) : false} summary_info +=3D {'mingw32 support': targetos =3D=3D 'windows'} + +# snarf the cross-compilation information for tests +foreach target: target_dirs + tcg_mak =3D meson.current_build_dir() / 'tests/tcg' / 'config-' + target= + '.mak' + if fs.exists(tcg_mak) + config_cross_tcg =3D keyval.load(tcg_mak) + target =3D config_cross_tcg['TARGET_NAME'] + compiler =3D '' + if 'DOCKER_CROSS_CC_GUEST' in config_cross_tcg + summary_info +=3D {target + ' tests': config_cross_tcg['DOCKER_CROSS= _CC_GUEST'] + + ' via ' + config_cross_tcg['DOCK= ER_IMAGE']} + elif 'CROSS_CC_GUEST' in config_cross_tcg + summary_info +=3D {target + ' tests' + : config_cross_tcg['CROSS_CC_GUEST'] } + endif + endif +endforeach + summary(summary_info, bool_yn: true, section: 'Compilation') =20 # Targets and accelerators diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index 551c02f469..36b8a73a54 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -263,11 +263,3 @@ for target in $target_list; do echo "DOCKER_CROSS_CC_GUEST=3D$container_cross_cc" >> $config_target_m= ak fi done - -# report container support state -echo "cross containers $container" - -if test -n "$enabled_cross_compilers"; then - echo - echo "NOTE: guest cross-compilers enabled:$enabled_cross_compilers" -fi --=20 2.20.1 From nobody Wed Nov 19 01:38:25 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1614167596; cv=none; d=zohomail.com; s=zohoarc; b=cRqRHWDKUxAZVKe0nAd7m/QMZbXoSQEAROlthDJQuIiEs9X7xsfjCJmLn7YHfzL7qBwMsNRhm6yXXyBEJ/QI1omqH9KqyPtS4AsAQjxGKPmd4mOCRvhi68BYO3yMXNTKNNehRjG81FQ+kts0Zt5XuM8CoLXvCLdJE5CWjuTZcEA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614167596; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5J+h2qu1UVArHEoKx2foQ1Hwm3QIMxAkKu6EvQL389s=; b=nW6nA5gaoaY15ayFEIQRWK4Uf2UtClbv5N4ku2G6x0UfnqAj3wM38LNb01LkivSao8fDqJXC89vpi89XyQL41KCjB0YqDkwmKmZvDvzjdTyw+wcEeRbiGbKm4QWkmblSdkTcr0Phn5MnGKVvkDZcUqvWyB4f0eJ7HaiDfWV0FIk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614167596052292.39295601173467; Wed, 24 Feb 2021 03:53:16 -0800 (PST) Received: from localhost ([::1]:38564 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEsjC-0001Vf-VO for importer@patchew.org; Wed, 24 Feb 2021 06:53:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56150) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEsfg-0005sC-Ep for qemu-devel@nongnu.org; Wed, 24 Feb 2021 06:49:36 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:39046) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lEsfe-0002UN-NV for qemu-devel@nongnu.org; Wed, 24 Feb 2021 06:49:36 -0500 Received: by mail-wr1-x431.google.com with SMTP id v1so1595592wrd.6 for ; Wed, 24 Feb 2021 03:49:34 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 36sm3382901wrh.94.2021.02.24.03.49.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Feb 2021 03:49:32 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 93ADF1FF8C; Wed, 24 Feb 2021 11:49:26 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5J+h2qu1UVArHEoKx2foQ1Hwm3QIMxAkKu6EvQL389s=; b=uEtFHNU15b/hrndoz/Dv/H+VTaax5+1X8bKVngoOKKINspvx2pOZj+SS+XauC0wGK+ lz2nOv79MDyYdJEvdVpZhZrF0vRErtBNno53oPXUM0dP3ygYjw5IHF+NoRlICQNdEwJR Q+I5EUNo5wIhyZRYWOb7YY23ihRZNeyNaSPIdgY2aP8HL68NACZjXcX2Dco7qUsRYMY1 V24ob5ylpLpwBEKGgk3+tGXR2ELhmo2Y227WShWP9Bijt5m+L28Ff+mam43X3B3W6q4N r9P4E2HIzxWHcb14X/iEIkMT0xJGt92xxuFr1X4Sat4NMgWd6CzKoasovn5YWr/nepSO 57mQ== 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=5J+h2qu1UVArHEoKx2foQ1Hwm3QIMxAkKu6EvQL389s=; b=Y75CEI899eyj9zXj56W5Xz30zS449qYf4mqGgUcf7oLQ8VPh9c41LbI8A5bVh9qjlF RSngA2HijlIbYSQMjkZFrPo6DPzH+J6QulXs4N+K4QlB9sc8UF6xm6AGTQyph0ZTN8BD Z/J2ivzannieU91HjzwengqAmyNrYRjsb3itrQ++Gpdbnvy1PZ26njnu32dbfwjFLal5 fhgRnH2/AZkpqbRKKKE7n4vn0zwmqqQofCc281qc1r5h+I0QVchszR7LRRCx6b+Tz6Gx LkgYIo5wcwD0nlEpyAmKSQSKdwAx7LeYJF90BykzH3pEL0gjtEePlDIHtFvvZN+1Sk6a SAsg== X-Gm-Message-State: AOAM531K9EoBq/0jNIi+tVLSvJcEMAfrKW42UzOIRE9GDiQXlLNgrY3G W92QS5hvS4wVNuul/sO1hFQMqw== X-Google-Smtp-Source: ABdhPJzyhVilnFN+WZOjP63FATPDIL/vYaJ+RsDb20xE8A8BoTZ09N7Z5SXP39vfKc9ODqUegrFcqQ== X-Received: by 2002:a5d:610a:: with SMTP id v10mr32014181wrt.334.1614167373480; Wed, 24 Feb 2021 03:49:33 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 2/7] docker: Bump Fedora images to release 33 Date: Wed, 24 Feb 2021 11:49:21 +0000 Message-Id: <20210224114926.6303-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210224114926.6303-1-alex.bennee@linaro.org> References: <20210224114926.6303-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Daniel=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , qemu-devel@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 Fedora 33 was released on October 27, 2020. Update all the Fedora 32 images to this new release. Suggested-by: Daniel Berrang=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson Message-Id: <20210118181255.314672-1-philmd@redhat.com> Message-Id: <20210222101455.12640-3-alex.bennee@linaro.org> diff --git a/tests/docker/dockerfiles/fedora-cris-cross.docker b/tests/dock= er/dockerfiles/fedora-cris-cross.docker index 09e7e449f9..1dfff6e0b9 100644 --- a/tests/docker/dockerfiles/fedora-cris-cross.docker +++ b/tests/docker/dockerfiles/fedora-cris-cross.docker @@ -2,7 +2,7 @@ # Cross compiler for cris system tests # =20 -FROM fedora:30 +FROM fedora:33 ENV PACKAGES gcc-cris-linux-gnu RUN dnf install -y $PACKAGES RUN rpm -q $PACKAGES | sort > /packages.txt diff --git a/tests/docker/dockerfiles/fedora-i386-cross.docker b/tests/dock= er/dockerfiles/fedora-i386-cross.docker index a6e411291b..966072c08e 100644 --- a/tests/docker/dockerfiles/fedora-i386-cross.docker +++ b/tests/docker/dockerfiles/fedora-i386-cross.docker @@ -1,4 +1,4 @@ -FROM fedora:31 +FROM fedora:33 ENV PACKAGES \ bzip2 \ diffutils \ diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/doc= ker/dockerfiles/fedora-win32-cross.docker index 087df598a0..81b5659e9c 100644 --- a/tests/docker/dockerfiles/fedora-win32-cross.docker +++ b/tests/docker/dockerfiles/fedora-win32-cross.docker @@ -1,4 +1,4 @@ -FROM fedora:32 +FROM fedora:33 =20 # Please keep this list sorted alphabetically ENV PACKAGES \ diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/doc= ker/dockerfiles/fedora-win64-cross.docker index d5d2f5f00d..bcb428e724 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -1,4 +1,4 @@ -FROM fedora:32 +FROM fedora:33 =20 # Please keep this list sorted alphabetically ENV PACKAGES \ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfi= les/fedora.docker index 0d7602abbe..915fdc1845 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -1,4 +1,4 @@ -FROM fedora:32 +FROM fedora:33 =20 # Please keep this list sorted alphabetically ENV PACKAGES \ --=20 2.20.1 From nobody Wed Nov 19 01:38:25 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1614167458; cv=none; d=zohomail.com; s=zohoarc; b=HqU1Q/9q26c5ftw4PAO7yO6UM/BVV981fjY1clXo3UGcyjQAeQJHzlvaKwwJVr/IpR5mPIrZsCC+EJbHeW65PyRLcm22H8rj0e8qQU6y/RiA/prkdxKweZTZStbCvETXCOn4do6q+9EYGBIkb8qlpXEKitjNdZCcw/pPV8eXQLE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614167458; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=eoIdMvHWxMQbDl3UBMTrBtc6tQc91c3mmdrnsIe6cmw=; b=Us8K2NqQF4ySfeX5D8j0NbXdJ+nsbYbImu1FWCcnemMELmgEI+UCeQe0qDSn5dZFeBq3h3X/vn1gcIt5ur2O8QbusjMcXvDKOM/3IMdRvgvKnOPQEacx/DsWV89BdsYyyigLEW+coNujlXHZ8KGJmmg02Jd3cfyCVOMm261g52M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614167458724380.88470673100255; Wed, 24 Feb 2021 03:50:58 -0800 (PST) Received: from localhost ([::1]:60536 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEsgz-0007EX-NL for importer@patchew.org; Wed, 24 Feb 2021 06:50:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56152) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEsfg-0005t5-Ug for qemu-devel@nongnu.org; Wed, 24 Feb 2021 06:49:36 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:38086) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lEsff-0002V3-Ii for qemu-devel@nongnu.org; Wed, 24 Feb 2021 06:49:36 -0500 Received: by mail-wm1-x332.google.com with SMTP id n4so115663wmq.3 for ; Wed, 24 Feb 2021 03:49:35 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id b7sm3142799wrv.6.2021.02.24.03.49.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Feb 2021 03:49:32 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id AA71B1FF8F; Wed, 24 Feb 2021 11:49:26 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eoIdMvHWxMQbDl3UBMTrBtc6tQc91c3mmdrnsIe6cmw=; b=SzfTz6lFjhcF2CnQ3opsnFVQLpJmJ7i3s1RD5N0oYaRAaB+jLEIJ2Bl6jMvM4S0r0j 60ljvkVcxfnrkHGgc/qnPAIT/xI5Wh1SIn1XoYQOKggM76XMvwCo1U+6r9Y4t/opuutj 1ejFpD67PauFrw+GSd0brOjMJwxYMyqGC745EAUm1HDmALNcGGWJgEFXmcLgyFtTCfOF uzzBGojpv6p1cpjctmF5N8YiSKiCoaCyDAa+O9v5VNAzinGR6o4/B+I7wUk/OZRYXi02 cow2Es/zip/oZ8TRYEQQMu7wuS3SadypKPHBclCn8WOPZ2orSBBpeOU2NoWJ2NVx6zsD B/aQ== 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=eoIdMvHWxMQbDl3UBMTrBtc6tQc91c3mmdrnsIe6cmw=; b=lw18acbuIWCh/pQ1iI575QMi61b1izDdwlPNdTSK++U14D763gUQb6JE6jvORs2z9Z G3UHlpjUT9/3qyHTs4iWO4bnv0vdZJP+Akx0q4023Cj3xuv80gEYEaZSRVF/LOp9SVdS UVS59ii+Ehv6SUPtTQlGgVA/iUlCCQHsWdoxWcuMraEwmGD6sRPi4Vy1ItmLJcqRbaH1 rsSVma9Sy650CXo58+TZ/aVFGkx5nUNEv2QOjaYEEipQvdAWt1kJ+tVPRVcXlQno41v+ gyDNsVE8n5VCFnUbZiSIV3YwxDReQxTU3s2mKpj46gy7saTTL1LCWdryZAW4HZrrNGwr hWOA== X-Gm-Message-State: AOAM531WCP8Eo04iF1COKohe/daFxUPvEccBIxpd0N7esAyzM5JpkqOj jPhgF4pWoOVS843Ervj8D6mUYw== X-Google-Smtp-Source: ABdhPJyGL6cBK0YjVJWLsF4dsmstSwWpNd47loj9z1StofUi7MS0bZS2JJp/MnVJBlqwuNjbqUQ9Lg== X-Received: by 2002:a05:600c:4ba2:: with SMTP id e34mr2555597wmp.121.1614167374339; Wed, 24 Feb 2021 03:49:34 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 3/7] tests/acceptance: allow a "graceful" failing for virtio-gpu test Date: Wed, 24 Feb 2021 11:49:22 +0000 Message-Id: <20210224114926.6303-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210224114926.6303-1-alex.bennee@linaro.org> References: <20210224114926.6303-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::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=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?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , Willian Rampazzo , Cleber Rosa , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) This is a band-aid with a TODO for cases when QEMU doesn't start due to missing VirGL. Longer term we could do with some proper feature probing. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Willian Rampazzo Reviewed-by: Richard Henderson Message-Id: <20210222101455.12640-4-alex.bennee@linaro.org> diff --git a/tests/acceptance/virtio-gpu.py b/tests/acceptance/virtio-gpu.py index ab1a4c1a71..ab18cddbb7 100644 --- a/tests/acceptance/virtio-gpu.py +++ b/tests/acceptance/virtio-gpu.py @@ -85,7 +85,12 @@ def test_virtio_vga_virgl(self): "-append", kernel_command_line, ) - self.vm.launch() + try: + self.vm.launch() + except: + # TODO: probably fails because we are missing the VirGL featur= es + self.cancel("VirGL not enabled?") + self.wait_for_console_pattern("as init process") exec_command_and_wait_for_pattern( self, "/usr/sbin/modprobe virtio_gpu", "" --=20 2.20.1 From nobody Wed Nov 19 01:38:25 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1614167720; cv=none; d=zohomail.com; s=zohoarc; b=lh13/rDur8nr6X1apj+40dbnYZHNFLoD8+BQw/n2iSdvHdA1Qqb26PeFCxB0EjLuF5BSZ1q8raszmIO0leMdVAmDdGORhqK2bzxj6XdAyM3yfcmfn+GHBfuQQl1xDhYOYGByOZiojj2+HMQHwbU33RY3pWSvZR+ad3ecuCcddtQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614167720; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hPNIwQ4zhm1AK5NXAwaoNz0ED39G8E1PPFGRzykjq6M=; b=GzOH5E/psOLa1cyCAN1V1yMN1XeBR6H7jeFKGo/XetDo8lqUVFeozdtomUk0WioBRbQpWNUhUfalgTrP/CnktcG0D1ZbcaNU6fCy9Pg3gWVpjFRKuTqFLE0vk5UsMYYRZdAeoLPmElrz0vonfhSBqm58Abyn5/egQevEeFGhFpY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614167720449900.5314202574456; Wed, 24 Feb 2021 03:55:20 -0800 (PST) Received: from localhost ([::1]:44894 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEslD-00048w-Fq for importer@patchew.org; Wed, 24 Feb 2021 06:55:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56208) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEsfm-00063i-7d for qemu-devel@nongnu.org; Wed, 24 Feb 2021 06:49:42 -0500 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:46075) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lEsfk-0002XH-Kj for qemu-devel@nongnu.org; Wed, 24 Feb 2021 06:49:42 -0500 Received: by mail-wr1-x42a.google.com with SMTP id e10so1379443wro.12 for ; Wed, 24 Feb 2021 03:49:40 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id a3sm2964038wrt.68.2021.02.24.03.49.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Feb 2021 03:49:32 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BEF4C1FF90; Wed, 24 Feb 2021 11:49:26 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hPNIwQ4zhm1AK5NXAwaoNz0ED39G8E1PPFGRzykjq6M=; b=wuzMHzrwBGydPTJkiOWYktfhgld6rLQOtsxLQH5aAuIosAC6vYJB//qwGY6YEyo5td V6+G8+t7x7BmqJRp3Cia+vMNs6YOmHgrrTxXt45BJQtkC99n5UHCSsh+b3plYjWhn/MF JYPOhOVX3lfu6u6ZQphRMCB1EOrmXtyAg+wvIYghBe0Ix95cDcTfgB/WqnOiIsOMeTgv 6QiHMlPMHszNTUXrFi60mH69X3Wo3GfmbTSJ16W2TpRzj/CHPcRFmlDNC30Q7KKgUgtZ k0GvrkY4Tu3WkB9X2Y6mT4WWYSywBnoLAeTTgIGkGvLVu8U6Iy114PaXRS843LxqlaEa GZDw== 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=hPNIwQ4zhm1AK5NXAwaoNz0ED39G8E1PPFGRzykjq6M=; b=V9frVCJnEnwtkjUfmi+Bcw8Fi9h8M0CCI+l2kNJiCMZHdc00CZzIGvgu5r/k6yyfAn UlLqqMoUnfHLRz1G9UxkXJz6fE9QL18tT32ja1CDEv/PDBfGXHxWeJZPa4PUuHyCd9i/ s+SSQxVXwswhCb3lJ+zluBqOrADh9NvQrA4O5xs51FO2tZlDPcJQYxyaBrHgwVGejZek uj2PTD/ivzfuaTZek/6HQdJkORIHDMVPW3ru5S/f/CYAq8550heDE9Z8c5kN8dwK8C1z XWdZVNF89KUyueErLwX3qGwfrMAjhixOhsJB3LklFnlou9JMRrottM3hUfqKbwMBc2JH 2eew== X-Gm-Message-State: AOAM532wAd2phL62IFAjLTkztTEyHd9ZzOTapBY/kaKFuKO9DtGHG2qI PJRBdnvpiGOHxPm8/PoSL4NCkA== X-Google-Smtp-Source: ABdhPJyXNC8fQv7cPJRb4sNMRihqV3YTiK1FuvbICWJo4QnvZAjWPCfFG6RW6tWJd75PjDvXUm3ubQ== X-Received: by 2002:a5d:4a88:: with SMTP id o8mr28325141wrq.155.1614167379287; Wed, 24 Feb 2021 03:49:39 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 4/7] docs/devel: expand on use of containers to build tests Date: Wed, 24 Feb 2021 11:49:23 +0000 Message-Id: <20210224114926.6303-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210224114926.6303-1-alex.bennee@linaro.org> References: <20210224114926.6303-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.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: Richard Henderson , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Expand on the usage of containers for building tests and why we have some that are not used to build QEMU itself. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth Cc: Thomas Huth Message-Id: <20210222101455.12640-5-alex.bennee@linaro.org> diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index 00ce16de48..488d4e3537 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -272,10 +272,10 @@ Note that the following group names have a special me= aning: =20 - disabled: Tests in this group are disabled and ignored by check. =20 -.. _docker-ref: +.. _container-ref: =20 -Docker based tests -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +Container based tests +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 Introduction ------------ @@ -1001,10 +1001,17 @@ for the architecture in question, for example:: There is also a ``--cross-cc-flags-ARCH`` flag in case additional compiler flags are needed to build for a given target. =20 -If you have the ability to run containers as the user you can also -take advantage of the build systems "Docker" support. It will then use -containers to build any test case for an enabled guest where there is -no system compiler available. See :ref:`docker-ref` for details. +If you have the ability to run containers as the user the build system +will automatically use them where no system compiler is available. For +architectures where we also support building QEMU we will generally +use the same container to build tests. However there are a number of +additional containers defined that have a minimal cross-build +environment that is only suitable for building test cases. Sometimes +we may use a bleeding edge distribution for compiler features needed +for test cases that aren't yet in the LTS distros we support for QEMU +itself. + +See :ref:`container-ref` for more details. =20 Running subset of tests ----------------------- --=20 2.20.1 From nobody Wed Nov 19 01:38:25 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1614167592; cv=none; d=zohomail.com; s=zohoarc; b=QWQzJNHN6FnY7KudXzM6idIhjvmJkzWQ77E2A2ajBfCcBf5Rrm8Hw0iD5UVsfAdoUX3Cz8+ykZeTf2Fqgqn6LA03nhwkvsSgHU2254KqDXVkyfMeCvQE5WF9aQGkCxI/dqIvPMVy9bd6JSVy4p7gQq1x3oicyR/XHu/HJw+MOXY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614167592; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fVmTUTItvD8Y9XDlb1Vri2ktpu4ZNI+gRqGqx4eqPS4=; b=CJPlzQBW0+i1ebueH5kDdOolxcbldJFr/4OuDwcBIDDvySvMsZAGu263fW6mhqxSzx/n7gEumtgLVIFhVGUYrfUvnbnwi0+/WWQN9T/WCu1gox7642+UJ7W8p5vAXSbUumyoJT65rLIKj+87tWzrFgY4OskDe94STzxBdsTTGMI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614167591643114.78217558010647; Wed, 24 Feb 2021 03:53:11 -0800 (PST) Received: from localhost ([::1]:38466 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEsj8-0001TG-6x for importer@patchew.org; Wed, 24 Feb 2021 06:53:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56206) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEsfl-00062X-MO for qemu-devel@nongnu.org; Wed, 24 Feb 2021 06:49:41 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:41710) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lEsfj-0002X9-R6 for qemu-devel@nongnu.org; Wed, 24 Feb 2021 06:49:41 -0500 Received: by mail-wr1-x42c.google.com with SMTP id c7so1593385wru.8 for ; Wed, 24 Feb 2021 03:49:39 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id c6sm3008164wrt.26.2021.02.24.03.49.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Feb 2021 03:49:32 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D4D3E1FF91; Wed, 24 Feb 2021 11:49:26 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fVmTUTItvD8Y9XDlb1Vri2ktpu4ZNI+gRqGqx4eqPS4=; b=sIp/mNBpQOkMZZ8VjCOpgePMhMOP5AABOefQ688/03tj7VDawEVxMrl4eD4RkfS8FD 9xc5A5FqAtl12qpOt8dDHw2vpbEpW7JiuJ486/JsiIuzqUMMHRi3/BU5BXda0lCcpfxN Gf6LHu5n1LCdG5IuV6UYGT8lkaZ2C8rf075y1hq4w4sTb91xJYXZ/DwYHcdWUVZEoBTE nFJdE04TVO1E/Wnc6H9gDubhzt4SyvD3DOQwhvfJ17EQqyKpSkn0q1oeZ1AMIjk1uOOn y8h647TjzdfRqfL5CpOuRfGaCWxTH9Xn3rc3SUjQlrD7ky+Y2J/QVK4OkLEAMbMATnJq v3IQ== 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=fVmTUTItvD8Y9XDlb1Vri2ktpu4ZNI+gRqGqx4eqPS4=; b=KaJEImK7fLqHLRceU9X7rJsWm9C1u3ff+sPhlQUv077+6RKy8gXGJcxPyAsavpwcUj ZFfvgM7J9qaL8q+72pOWAvOyV69ZskQ2Eb1jmzZ2kVDbUebgWbWM/8sm//s9DWibUBIt Wl7lsXbNJZ/MXVqt+QpShgDU7uOCtORkgf7jCORG3qqNWuCLwnqOz9HgSc9pfhfIZ3oK 73iISehvSZOYAIjaTMvj1qyiZayJGdTlX6CSFGfCtuStazEUIKcS+o0VGciWWWg/C6Bc S/hoYFfabFPnAIVfHhHwLgeM3QUFae/rAaiNyxalBUgDkikrEZZu0IwWNCg2pIo5/IuH jZRQ== X-Gm-Message-State: AOAM530AODLVOjSy4rpXq0YQoS6uNKq5DjsnjIZ3NrFm8UU/TIjnQy3a eu4bo1xmi3MBsEjOfQ3/Dw2AhQ== X-Google-Smtp-Source: ABdhPJzMxcsvxgIXeolPAD715xbgG/gvADAcXMVxglqpFnj725CeXB6M4z7hlR+hwSKIKCkVOlMKCg== X-Received: by 2002:a5d:4cd0:: with SMTP id c16mr31196259wrt.84.1614167378507; Wed, 24 Feb 2021 03:49:38 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 5/7] docs/devel: update the container based tests Date: Wed, 24 Feb 2021 11:49:24 +0000 Message-Id: <20210224114926.6303-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210224114926.6303-1-alex.bennee@linaro.org> References: <20210224114926.6303-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42c.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: Richard Henderson , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) This section has grown a little stale so clean-up the language and examples for current usage: - refer to containers at the top - mention podman can also be used - add podman prerequisites section - move to using "docker-help" for online help - mention the registry and it's purpose - don't refer to out-of-date min-glib image Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth Message-Id: <20210222101455.12640-6-alex.bennee@linaro.org> diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index 488d4e3537..e57260478a 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -280,13 +280,17 @@ Container based tests Introduction ------------ =20 -The Docker testing framework in QEMU utilizes public Docker images to buil= d and -test QEMU in predefined and widely accessible Linux environments. This ma= kes -it possible to expand the test coverage across distros, toolchain flavors = and -library versions. - -Prerequisites -------------- +The container testing framework in QEMU utilizes public images to +build and test QEMU in predefined and widely accessible Linux +environments. This makes it possible to expand the test coverage +across distros, toolchain flavors and library versions. The support +was originally written for Docker although we also support Podman as +an alternative container runtime. Although the many of the target +names and scripts are prefixed with "docker" the system will +automatically run on whichever is configured. + +Docker Prerequisites +-------------------- =20 Install "docker" with the system package manager and start the Docker serv= ice on your development machine, then make sure you have the privilege to run @@ -316,26 +320,53 @@ Note that any one of above configurations makes it po= ssible for the user to exploit the whole host with Docker bind mounting or other privileged operations. So only do it on development machines. =20 +Podman Prerequisites +-------------------- + +Install "podman" with the system package manager. + +.. code:: + + $ sudo dnf install podman + $ podman ps + +The last command should print an empty table, to verify the system is read= y. + Quickstart ---------- =20 -From source tree, type ``make docker`` to see the help. Testing can be sta= rted -without configuring or building QEMU (``configure`` and ``make`` are done = in -the container, with parameters defined by the make target): +From source tree, type ``make docker-help`` to see the help. Testing +can be started without configuring or building QEMU (``configure`` and +``make`` are done in the container, with parameters defined by the +make target): =20 .. code:: =20 - make docker-test-build@min-glib + make docker-test-build@centos8 =20 -This will create a container instance using the ``min-glib`` image (the im= age +This will create a container instance using the ``centos8`` image (the ima= ge is downloaded and initialized automatically), in which the ``test-build`` = job is executed. =20 +Registry +-------- + +The QEMU project has a container registry hosted by GitLab at +``registry.gitlab.com/qemu-project/qemu`` which will automatically be +used to pull in pre-built layers. This avoids unnecessary strain on +the distro archives created by multiple developers running the same +container build steps over and over again. This can be overridden +locally by using the ``NOCACHE`` build option: + +.. code:: + + make docker-image-debian10 NOCACHE=3D1 + Images ------ =20 -Along with many other images, the ``min-glib`` image is defined in a Docke= rfile -in ``tests/docker/dockerfiles/``, called ``min-glib.docker``. ``make docke= r`` +Along with many other images, the ``centos8`` image is defined in a Docker= file +in ``tests/docker/dockerfiles/``, called ``centos8.docker``. ``make docker= -help`` command will list all the available images. =20 To add a new image, simply create a new ``.docker`` file under the @@ -355,7 +386,7 @@ QEMU. Docker tests are the executables under ``tests/d= ocker`` named library, ``tests/docker/common.rc``, which provides helpers to find the QE= MU source and build it. =20 -The full list of tests is printed in the ``make docker`` help. +The full list of tests is printed in the ``make docker-help`` help. =20 Debugging a Docker test failure ------------------------------- --=20 2.20.1 From nobody Wed Nov 19 01:38:25 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1614167718; cv=none; d=zohomail.com; s=zohoarc; b=DIayKDsqq+1F5mKf1LdBaT/qD5tNp35w7s/DY2th9RibmN2K4kIjK4JZdCH+j/KiOtSQjp5strg2C+RW1zZ7b0gVFoQGERZcJhFeMhGNzwXG/8FfeiFTmakx4Nn2c0URMFJAErIIH1HxXRXAum/Bknb/OuCPvv0bWZrZH/FqiNA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614167718; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Y8B1vPXzRBogm2IsyqC82CLwOzScpQxFfMMP8XRknLE=; b=mcvjhphpAAcEzWnNgN5kP/OsddVgqSanfCTDeQ1Ti2HOKDYHbZZgKFzMiLJX9tqAFZ5kxZR8ZXtAKFhbpS4NsReeq32CfXsYLsBPRNsJ9N7ug8g2zMJ5fRlUTrwA4ANOVoAP9VPH4UjmuGdByaubbAIi+lp4t3jsCCEMdBR0oPM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614167717823906.9122785621661; Wed, 24 Feb 2021 03:55:17 -0800 (PST) Received: from localhost ([::1]:44738 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEslA-000452-QO for importer@patchew.org; Wed, 24 Feb 2021 06:55:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56176) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEsfi-0005wp-Rv for qemu-devel@nongnu.org; Wed, 24 Feb 2021 06:49:38 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:39039) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lEsfh-0002Vm-AG for qemu-devel@nongnu.org; Wed, 24 Feb 2021 06:49:38 -0500 Received: by mail-wr1-x429.google.com with SMTP id v1so1595731wrd.6 for ; Wed, 24 Feb 2021 03:49:36 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id w4sm2548314wmc.13.2021.02.24.03.49.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Feb 2021 03:49:32 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E8CE01FF92; Wed, 24 Feb 2021 11:49:26 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Y8B1vPXzRBogm2IsyqC82CLwOzScpQxFfMMP8XRknLE=; b=bJDuRvfuf51Z9ZDi8nNjGm1+uRGvjKsC6fNSsWZjSQ5ll79KqV6x2vRiBF8cx2w2Wj 5Iy/cKUxlQbzGGtFOB6zx5NaOJZpDNgNFNibCEPG7XGSg7f+LIcCCkdgQvKrNU4sfUNv zsKCx0Lq2nwFVZH3HOwYyD0EvR9A++QfPjHevA5nMrMezFaBsyCExJtGFDSSafviWIIP d+0P9v0iDLNzoHioVFFb6hR6KcYVjeu17YtHg7ta/2Qpn1dSFbuhvrdRq3U9Dqut/MfD Z0HH9oqc2gR6zsy/1gizqYO3yArbGgzzRecsQqsadslWPJGOVFCa1bRrHOgQHffImvUs SdcA== 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=Y8B1vPXzRBogm2IsyqC82CLwOzScpQxFfMMP8XRknLE=; b=YETiN7JKZIfeDJhC6vlGYhnIeo3hYd2X0Bb0D/FXtq9XhB2b4aT5+O9dC+YTjPtnaD GHJWUQnKCSCcju2LiPg1mdKGzd7NW0dUlPxkw2W0+FbsNqH40z4ZzQBqM58KHJhw72Pt uypOjLJoP5DOXqj8T3PscGM+aaH6Ba9GFQdX4LBDzSQi82EECdLTJ89hoFrgU39oG/Zz FhPRQ7F2X6ehw39Zq9De+OA+960WMIrU6eAra09rf/pbcM5m+4BmoQd0l+Ba6FRqraoI tr5so4ljXpIuVu5cK562FflCWPVN/ZYhk90mr8gKpOH3GS0PYsYbAvaYzWfx4UD942DE tw3Q== X-Gm-Message-State: AOAM532BvfWEGW9E56rHhnjmfYM8HewZssFwCp6AWo4RYW9FpKV4CnEa hYBt+1pVvn2eO82sF5SPq0bi4Q== X-Google-Smtp-Source: ABdhPJw67vsk6Xad5+soR50hhnYo8sV8jtMqZ1hrhxliVYwPQ9+ZI+4GFp/0vLJHR9ahVaqYkNW0uw== X-Received: by 2002:a5d:6281:: with SMTP id k1mr4912114wru.405.1614167376061; Wed, 24 Feb 2021 03:49:36 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 6/7] docs/devel: add forward reference to check-tcg Date: Wed, 24 Feb 2021 11:49:25 +0000 Message-Id: <20210224114926.6303-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210224114926.6303-1-alex.bennee@linaro.org> References: <20210224114926.6303-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x429.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) For completeness reference the check-tcg tests in the container preamble text. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth Cc: Thomas Huth Message-Id: <20210222101455.12640-7-alex.bennee@linaro.org> diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index e57260478a..1434a50cc4 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -289,6 +289,9 @@ an alternative container runtime. Although the many of = the target names and scripts are prefixed with "docker" the system will automatically run on whichever is configured. =20 +The container images are also used to augment the generation of tests +for testing TCG. See :ref:`checktcg-ref` for more details. + Docker Prerequisites -------------------- =20 @@ -1011,6 +1014,8 @@ And remove any package you want with:: If you've used ``make check-acceptance``, the Python virtual environment w= here Avocado is installed will be cleaned up as part of ``make check-clean``. =20 +.. _checktcg-ref: + Testing with "make check-tcg" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D =20 --=20 2.20.1 From nobody Wed Nov 19 01:38:25 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1614167599; cv=none; d=zohomail.com; s=zohoarc; b=A7gLHmcM646pu1R/FvG6+YW8HnUPxred3JH684zNbVIvMLfeoDpysySgH2SMYGVq+B3tiz6UN30SjXQ9mwX47eDGVjO4dkSVUHCtutfVlScUmcdRCWtOtExhjfblGJyUgxzWOUBjnVd60RFUOj14Gl8ElJnRkbmil+a0ppomcS4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614167599; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Y3+FxSWPTBVmvCmaxvS+5zSnQOKO5uWtcRTHkxOmIUk=; b=b69AvonsMArFlX44TNTYA8i0/YzXKn9bFjcEbJENLsWYSCuzd7acH5+qwY76aCW/YCUTrYgqp3w58lsYHDfV1XuR3maW04NWxx94r3qNtETn0cJH0diWhMeUYhd85qJMB8ZKYRZELsiBs6yZ0ZjaUYe+Ygxvi7ZcLlKDaKhRRJM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16141675989221004.9747579581334; Wed, 24 Feb 2021 03:53:18 -0800 (PST) Received: from localhost ([::1]:38824 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEsjF-0001cF-T5 for importer@patchew.org; Wed, 24 Feb 2021 06:53:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56180) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEsfj-0005yt-Ne for qemu-devel@nongnu.org; Wed, 24 Feb 2021 06:49:39 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:54752) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lEsfh-0002WA-Sd for qemu-devel@nongnu.org; Wed, 24 Feb 2021 06:49:39 -0500 Received: by mail-wm1-x332.google.com with SMTP id v21so1535416wml.4 for ; Wed, 24 Feb 2021 03:49:37 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z18sm3056063wrs.19.2021.02.24.03.49.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Feb 2021 03:49:32 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0F68B1FF93; Wed, 24 Feb 2021 11:49:27 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Y3+FxSWPTBVmvCmaxvS+5zSnQOKO5uWtcRTHkxOmIUk=; b=L+45VmDnMDz80wfoAUg5qOiyhHP0ELQA8awrLLft66s9TE87zY278qxvxQDgo3qc+r g2WdI18VKAdgZ9t6DvKtMqjkvLIBybXyZvnZ5xJY5j7eH+Lfr98TTst4znsF2t10nvkh s9zny0+qV54cUDz6/6Thu2LEdSskEvrx52ffn4tQOik5RpryTri1zRy//PXi9iRB1YEE Tp1xusCSiossnJ13vtnK6inXBfjkPCfXExzEdyakhYCmMs0f3yBO/fVs1h5Go7abuLjY ARr7Zc8KkBnLdFYHZLp+ay4qv1f/j311cm6nUD5zaGFOdJvvnoLaY7aPLCw3BRsaPkda gSqQ== 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=Y3+FxSWPTBVmvCmaxvS+5zSnQOKO5uWtcRTHkxOmIUk=; b=Wbhvkju74GhphfrCIub2r0OdYL03762JlogpB7Jfa7CLqtA+ybbOOunFfezeQ5W+5J 139uE63eITyyKOf4XsjmybUqgika4a7etf9wpfgiKLh30CYY4BYkDPmxukj2ByNi9Cwi obN/JtGrRPynQcFf+qUDmQDPXuceYt7HNB9yUXW5/AYt040VD8Q8TZDSHdoEdNWC2RRw +a+r2rKF3WL9iRCyBuNIm4P3cRUPv8MW7KRiBiV8AE73LDccnm8/J/eikhnQysIz5KIG 4taly7yfblbRMOlL9vKbgrJcDVKDtmXrnvsJw1KCsACMgwpyN6SYEwtT5SrDUL8XYcXX jWeQ== X-Gm-Message-State: AOAM533BT1DPJi6gr4DK2GxqtFyi4vb3aGaUTFwoowN7L1z4ZHtBiQ0L 7eqQzdUWAbhjOkAQiNFYpE5BA+rqqGAwEA== X-Google-Smtp-Source: ABdhPJzBIPTHGSS4M5qoTxiW+c98cN4aYDXDUyjzF8kvenMLCNkdr86zuTxf+HEd69e/sA2S3sTUTg== X-Received: by 2002:a05:600c:2149:: with SMTP id v9mr1669798wml.102.1614167376721; Wed, 24 Feb 2021 03:49:36 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 7/7] docs: move CODING_STYLE into the developer documentation Date: Wed, 24 Feb 2021 11:49:26 +0000 Message-Id: <20210224114926.6303-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210224114926.6303-1-alex.bennee@linaro.org> References: <20210224114926.6303-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::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=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org, Claudio Fontana Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) There is no particular reason to keep this on it's own in the root of the tree. Move it into the rest of the fine developer manual and fixup any links to it. The only tweak I've made is to fix the code-block annotations to mention the language C. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Claudio Fontana Message-Id: <20210223095931.16908-1-alex.bennee@linaro.org> diff --git a/docs/devel/index.rst b/docs/devel/index.rst index 22854e334d..ae664da00c 100644 --- a/docs/devel/index.rst +++ b/docs/devel/index.rst @@ -14,6 +14,7 @@ Contents: :maxdepth: 2 =20 build-system + style kconfig testing fuzzing diff --git a/CODING_STYLE.rst b/docs/devel/style.rst similarity index 99% rename from CODING_STYLE.rst rename to docs/devel/style.rst index 7bf4e39d48..8b0bdb3570 100644 --- a/CODING_STYLE.rst +++ b/docs/devel/style.rst @@ -641,7 +641,7 @@ trace-events style =20 In trace-events files, use a '0x' prefix to specify hex numbers, as in: =20 -.. code-block:: +.. code-block:: c =20 some_trace(unsigned x, uint64_t y) "x 0x%x y 0x" PRIx64 =20 @@ -649,14 +649,14 @@ An exception is made for groups of numbers that are h= exadecimal by convention and separated by the symbols '.', '/', ':', or ' ' (such as PCI bus id): =20 -.. code-block:: +.. code-block:: c =20 another_trace(int cssid, int ssid, int dev_num) "bus id: %x.%x.%04x" =20 However, you can use '0x' for such groups if you want. Anyway, be sure that it is obvious that numbers are in hex, ex.: =20 -.. code-block:: +.. code-block:: c =20 data_dump(uint8_t c1, uint8_t c2, uint8_t c3) "bytes (in hex): %02x %0= 2x %02x" =20 diff --git a/README.rst b/README.rst index ce39d89077..91aa1e314c 100644 --- a/README.rst +++ b/README.rst @@ -66,7 +66,9 @@ When submitting patches, one common approach is to use 'g= it format-patch' and/or 'git send-email' to format & send the mail to the qemu-devel@nongnu.org mailing list. All patches submitted must contain a 'Signed-off-by' line from the author. Patches should follow the -guidelines set out in the CODING_STYLE.rst file. +guidelines set out in the `style section +` of +the Developers Guide. =20 Additional information on submitting patches can be found online via the QEMU website diff --git a/scripts/fix-multiline-comments.sh b/scripts/fix-multiline-comm= ents.sh index 93f9b10669..c15a041272 100755 --- a/scripts/fix-multiline-comments.sh +++ b/scripts/fix-multiline-comments.sh @@ -1,6 +1,6 @@ #! /bin/sh # -# Fix multiline comments to match CODING_STYLE +# Fix multiline comments to match docs/devel/style.rst # # Copyright (C) 2018 Red Hat, Inc. # --=20 2.20.1