From patchwork Thu Feb 1 12:28:31 2024 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: 768856 Delivered-To: patch@linaro.org Received: by 2002:adf:9bca:0:b0:33a:e5bd:fedd with SMTP id e10csp355838wrc; Thu, 1 Feb 2024 04:30:12 -0800 (PST) X-Google-Smtp-Source: AGHT+IEpeHwZR4366K76vGsppsSOyhSJMQHSbqTvXmafHUA17WIvQ0DG78I1ikz4qAgpbOaZNks5 X-Received: by 2002:a05:6122:a20:b0:4bd:4356:40bc with SMTP id 32-20020a0561220a2000b004bd435640bcmr5091741vkn.5.1706790612225; Thu, 01 Feb 2024 04:30:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706790612; cv=none; d=google.com; s=arc-20160816; b=e6jIPI7paPr9Y+ADz1MR9iYmnECZCXb0upZweygk71bZ2TullMnKThdvK3NUhNyTlt uIKFrZWkEFWlfOMwQ6uex0PtYxzLl568enLq0jJmvPasTni8LpQ/ja7t1TQEGhP9AAY/ 5l2PcNqaufFRXNZsbCxPte2WJ3eQe5sJhRT83VeOg/9Pa538EJk0dOvXx0JQ7lsBH3v0 S1dhIV3dCZsyfJU1Qob0kciPMFFo1PlHUCaOO/7idnPSkZx/qN/7kbvbSPOwOV4DuL7+ FN+2Gimhv3Zz/dlEHCRkMkjpAgE50N7e0J+blvU5zkakNP0Wn4DD/VpenoPwy4k41UV0 uNNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=JB4Epfg8EtaZj5aKH+XSQiP5F2xLNHDHewznk8QZ/uQ=; fh=FQJeDIcfEOUQbpnTKKD/XR1j9Jjo7Kllo38FlGXuYlc=; b=thN01oRrhJerbCkmnT6SMlqaKnlyECYgmX0GIbKAkEB8yO3VCYtlZaTipGKJhQ5ziE 6GHbkEfZeWJ+aFnb/eWI1NWmeEnCAPB1rCFNQoKEnopbSNXZ/qE7dKd6I9vwpIhZ2fuC wEVrA7dXw8UoHhwLZYDo6+WB3uaZ5yQGgoMK/YArapoAQtYwFduHYnLWcIwigbyjPSoJ jjYW00jlu0/JJ3BbNhqjDDJSQ3Pa97kMCAzgVQWPdYWT1HS04frvunHR12kxCj20jz5F W5aLEC+y1uIoVb/M+HO+cdsZDAhO9ZAUG7b8gcwBIZp0B2/r9stu5UPgQ+U/gQiLDIz2 Imaw==; darn=linaro.org ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Mhf5eHhM; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org X-Forwarded-Encrypted: i=0; AJvYcCWbkhXqj0Dsbel5xNsBWfjSjRw4cYGT5Ogq5KuW/eBPmJGdDroiyXhTgCq5RvBfGB3yn9T4xEvWVukMgxmJwOAP Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id js4-20020a0562142aa400b0068c3f16ea1bsi11200183qvb.99.2024.02.01.04.30.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 Feb 2024 04:30: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=pass header.i=@linaro.org header.s=google header.b=Mhf5eHhM; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rVWBQ-0007ph-5T; Thu, 01 Feb 2024 07:28:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rVWBM-0007nV-Rd for qemu-devel@nongnu.org; Thu, 01 Feb 2024 07:28:41 -0500 Received: from mail-lj1-x22a.google.com ([2a00:1450:4864:20::22a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rVWBK-0002AS-Bs for qemu-devel@nongnu.org; Thu, 01 Feb 2024 07:28:40 -0500 Received: by mail-lj1-x22a.google.com with SMTP id 38308e7fff4ca-2d051fb89fbso12224041fa.2 for ; Thu, 01 Feb 2024 04:28:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1706790516; x=1707395316; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JB4Epfg8EtaZj5aKH+XSQiP5F2xLNHDHewznk8QZ/uQ=; b=Mhf5eHhMd9726iLRgT9RJF6EXSLQojnDqkZb8e2c211DUlYi6jvHaOobEIPayuK+1e Kkje8KSPxT0kbWE9vX6bjuJirXQ6Ooj+K5dtWmZcKSu/OTDQ8SQzuausiIOnzVK4jFuD ba4i6bcLl8lYfrVl3QP7ZGgqMj9WZIfH/DgsJAqdGaA0ySMbyvOsiqT/fzozR4sSyt6I M4Y+e5oZQhq8WP0WGAhsCv+q/yW8Mq9FG4Jw4O53fS77j43bTDQVr3B8f578MkiYsJsA wOfeINeedt0DzSJfUKzqYn+u2afXlSK3KrWAmnLFBQpIhxQX6upHRiq6rA7lSEnw4VcO 71gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706790516; x=1707395316; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JB4Epfg8EtaZj5aKH+XSQiP5F2xLNHDHewznk8QZ/uQ=; b=k/w+nczmLmxiTGLpRrX9/Menny1Gy02SiXZWhZT/Vj4xTlbtLuKiBEd/zrmFpDDwXC Z3szGCu+oZeuUQj8ilNzLDNa4H0Hg5wOcPHVRDRG2Y/vembGf/z3XM8+F9TuOACeC/Hv dUtrHkMlm0qXwEezqMGRj+/6ZoEj46jE7JaXmCOe/7z0AtrqfQN7qRnQPuf9ouzdVA7g 4PuxVqYJf4HFRmfvZFK6tQPL1eGD+3nITR1AvPBlWq96Gkd5eZxUKpSv/nZNTYgKUyMr SRJi65JuYPRVG8hJFOvhFqwz4naX6/a9Z01TUxHiCbW/UpHgbeRWzgh9/0x271d7Pjqr UO/A== X-Gm-Message-State: AOJu0YwCQPN/vQerzF0R6HkCtqeHB5imJhRPvG+N+11AWFKO9+d7yi+L fCho8okQ63XQxakc2PXF8V3NqgNQGeQEjfNgntj0hNTrjbOimehsAw0D2eT6vbc= X-Received: by 2002:a2e:924a:0:b0:2d0:58b9:2bf3 with SMTP id v10-20020a2e924a000000b002d058b92bf3mr3633384ljg.20.1706790516372; Thu, 01 Feb 2024 04:28:36 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCW6RyN6yqTxhJY7XB2eZbbKlZIoLtk+r8yMdvLzY//FuqQrAuQ7u0YYnST4sLz8+61z2D8dpgSyB1g0nZ0tXJW6lRmu2IOYksW1fyeB1unTTlNhsqe8u6khODW4tPeV5Z4s8kpAVPs0gup8vF+lUi4poTgztrZxyyhsZhVUUpEiIoMAH+LY2XKySSFme6372RZy7IHmeegM9iEyRpltzlRTm+4w11T0fH6yUARFfE3WaxUP3WHqMgSHvoBqoO1EZcIbtiUF+oThrBMFchCZuGdOKF7ghEkrlnZIgxAy88D9+7Hjl0yWjVlaZw7ceJIEMYuUasajWOfOFYoSge+n/XJcAqIAbIslaDC9vguj6YihichrLEgHcEqdYVAvzAokB51wc3gUnNeG+EtFo35c9xHURio3Ia+YRdnUjBbhrIKMEvVbXJa6l3t56LIYoIEG0mjn8pninNcfgOavxm10wDTCusy6P9kwyjsYy5udPsFnm4vQ3iyx+UEnilNivv85nXmmAJ6vEX9knNoKzAICZanprhpfOitjbn2Q0YOvPHWDdvZCoCBNeAZH8aoN2Hrwbg7Y2mOk0Pan5PqXwacn1XKB6HMXAB+LEAu/ACSTxNrLZM6/zIbXDsSQnXKIhbnD/IZ6NCIntvbTsrtE4JXT1SoIECEjaHphMfRjzhIE8niZ7khzdRohSsgLcueVjA== Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id cs10-20020a0564020c4a00b0055d37af4d20sm6621335edb.74.2024.02.01.04.28.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Feb 2024 04:28:35 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 5E4DF5F9D9; Thu, 1 Feb 2024 12:28:35 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Daniel Henrique Barboza , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Weiwei Li , Bin Meng , Laurent Vivier , Jiaxun Yang , Palmer Dabbelt , devel@lists.libvirt.org, Paolo Bonzini , Alistair Francis , Max Filippov , Marek Vasut , Liu Zhiwei , Thomas Huth , qemu-riscv@nongnu.org, Wainer dos Santos Moschetta , Aleksandar Rikalo , Beraldo Leal , Aurelien Jarno , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Chris Wulff , Fabiano Rosas , Andrea Bolognani Subject: [PATCH 1/5] tests/docker: Add sqlite3 module to openSUSE Leap container Date: Thu, 1 Feb 2024 12:28:31 +0000 Message-Id: <20240201122835.1712347-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240201122835.1712347-1-alex.bennee@linaro.org> References: <20240201122835.1712347-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::22a; envelope-from=alex.bennee@linaro.org; helo=mail-lj1-x22a.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Fabiano Rosas Avocado needs sqlite3: Failed to load plugin from module "avocado.plugins.journal": ImportError("Module 'sqlite3' is not installed. Use: sudo zypper install python311 to install it") >From 'zypper info python311': "This package supplies rich command line features provided by readline, and sqlite3 support for the interpreter core, thus forming a so called "extended" runtime." Include the appropriate package in the lcitool mappings which will guarantee the dockerfile gets properly updated when lcitool is run. Also include the updated dockerfile. Signed-off-by: Fabiano Rosas Suggested-by: Andrea Bolognani Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20240117164227.32143-1-farosas@suse.de> Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/opensuse-leap.docker | 1 + tests/lcitool/mappings.yml | 4 ++++ tests/lcitool/projects/qemu.yml | 1 + 3 files changed, 6 insertions(+) diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker index dc0e36ce488..cf753383a45 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -90,6 +90,7 @@ RUN zypper update -y && \ pcre-devel-static \ pipewire-devel \ pkgconfig \ + python311 \ python311-base \ python311-pip \ python311-setuptools \ diff --git a/tests/lcitool/mappings.yml b/tests/lcitool/mappings.yml index 0b908882f1d..407c03301bf 100644 --- a/tests/lcitool/mappings.yml +++ b/tests/lcitool/mappings.yml @@ -59,6 +59,10 @@ mappings: CentOSStream8: OpenSUSELeap15: + python3-sqlite3: + CentOSStream8: python38 + OpenSUSELeap15: python311 + python3-tomli: # test using tomllib apk: diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml index 82092c9f175..149b15de57b 100644 --- a/tests/lcitool/projects/qemu.yml +++ b/tests/lcitool/projects/qemu.yml @@ -97,6 +97,7 @@ packages: - python3-pip - python3-sphinx - python3-sphinx-rtd-theme + - python3-sqlite3 - python3-tomli - python3-venv - rpm2cpio From patchwork Thu Feb 1 12:28:32 2024 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: 768858 Delivered-To: patch@linaro.org Received: by 2002:adf:9bca:0:b0:33a:e5bd:fedd with SMTP id e10csp355779wrc; Thu, 1 Feb 2024 04:30:06 -0800 (PST) X-Google-Smtp-Source: AGHT+IH9UeoGnH40+K0Nr0tFPxVEM4ZdC+eYxDq38rSM0z3wEMpbvj9b4vZ3NYoYnXTOQX6S/ZYT X-Received: by 2002:ac8:7d12:0:b0:42a:6ea9:f2df with SMTP id g18-20020ac87d12000000b0042a6ea9f2dfmr5048617qtb.49.1706790605840; Thu, 01 Feb 2024 04:30:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706790605; cv=none; d=google.com; s=arc-20160816; b=WJAljOaElgKHlQr17//wouwsNwWc+TSDCFj3q//JoLVrsV/RCmAXL9MKvcWZdeXgm8 Y+sndFvbAdUs/PJZigTxnF0wlzrmk00BFbwmBQxSU1IXBiVbJ8/7MTCLRSzkO5ICMJnN T1kMfmbLVK3VEX25ovtFZzHDSUkSQ0lfiV+JHlCybncGFaiDH3x5SF6f4H7Ic23dT23s Ler0Wme5OUR+s8KxM2AQ6r2muCVOzmSBaszlAeqpTU9r+i5JgXXsJy7N6UZRhs7+18Hd MreZopaCyW5O4/GeKkZ8poJCnRjSMgLLuALc55pHbUnrRvC0HWm/5DrVvfnP94tm7Tqa zhjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=L7ej3O0CatCEUFzw6u9SlCujsXb/1bH6cTaIS9kjyEM=; fh=5ugYT6tOjiaj5LlPTHGoQjdeRf07b0CRqQDJsv66njs=; b=Y1RYPNuMHPhjW+0njaDgrnnJ8ib2hfdEFMpLuJ/831NZpurRd9PxbykJBrB2I0A6K5 JYmPbvdYNlZPd2yqnZnPGQb8ooUjVN0qKMDe2n3syjJyZVSvl/f1vXDBc9hMGHGLinOO MD6/XmrhzRiA1iANuNthHWjMEYlkothFz/a+gO3b3MZatRFe7M3n7rOPNaDFibJDKCIq OK62mYC3iMziKD2sokhmanOw0nnD04DfufEGgs99pFS89IPdE/CNPiHJl9azFAh6gO4e HvKaept6nLl/2M1X4niSPS771HVxAlP+oL10dLFk8ptdFmSydlCHlL/1B6n8309otne7 NkDQ==; darn=linaro.org ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DcJVJsNw; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org X-Forwarded-Encrypted: i=0; AJvYcCX4eMh1Gqohxw4fjwYkWCOh8bq759qhzDNQXzIw4rgJMfib3ekrOkRKpt7XFl5pfuImVBO5WNupKxhLsDm1D7Jf Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v22-20020a05622a015600b0042bebf7d021si2803625qtw.351.2024.02.01.04.30.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 Feb 2024 04:30:05 -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=pass header.i=@linaro.org header.s=google header.b=DcJVJsNw; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rVWBO-0007p3-Lj; Thu, 01 Feb 2024 07:28:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rVWBM-0007nU-QQ for qemu-devel@nongnu.org; Thu, 01 Feb 2024 07:28:40 -0500 Received: from mail-lf1-x134.google.com ([2a00:1450:4864:20::134]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rVWBK-0002AQ-AL for qemu-devel@nongnu.org; Thu, 01 Feb 2024 07:28:40 -0500 Received: by mail-lf1-x134.google.com with SMTP id 2adb3069b0e04-51124d43943so1279335e87.2 for ; Thu, 01 Feb 2024 04:28:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1706790516; x=1707395316; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=L7ej3O0CatCEUFzw6u9SlCujsXb/1bH6cTaIS9kjyEM=; b=DcJVJsNwB8DCM9XbjtWJUjtpTSJKAN4jxMh5Hu6Qx94XqnfmPWI5EqqbGGbv4bdS+Z 4jTPpIT0sDQnbaT1gwJ1aVVsQkPg4rQ+rJ6vGVDP1ZToqA+ETnu27MOI2YJVQXLkHAx2 u3MOoN/z7gO7LWAWJj231bTdP0+qTAyXb7BASbgjhSDbFkZCVMKl6AIyK5oTrrXbV3GO RUwTcacYKSw0/tW8nVmWi6UUQcEDMLjse5Kixaaz2EmfQGt3J/VDbYU14Ba217S/2Mwb 3qbPeF/iNtkFvhyjjHd+lBCem9VKHcYytyggtyqDv1HZWnxx5E3XlXGTHtf4mc60eRTw qIXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706790516; x=1707395316; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=L7ej3O0CatCEUFzw6u9SlCujsXb/1bH6cTaIS9kjyEM=; b=LzzEkuymR+lc2mtHi3WwG49E0vQ4N+Y2sz8FBrhylNoje+0sFeRKe8RmHajtFYKBMO Hynxt0qJgmstvyzYvN0N77t/d8gmsh3CdCdkOeSmdDUbaPZTy9jMrYdJbSPRCHEpg3Ac RC1Hl+WQo4sBu6oQe8svMJrXHNBlnHTz67sRbDOj5EqpU5HIDLxRrxZDT5CXHW2mryyj +paEPvbIVL95EnFReG4FEis4CD8l4K4NIgvPZmg+mTPYCZkI5SvYU30QR+dxLk8S/fbV eKZ3w3IcGv2ss+oYMU1UDPnGK2j6NGGnGSFq+C650sNh1bxQJn5uk7T51CkgQo8LnYVA Ph1g== X-Gm-Message-State: AOJu0YxVp2QuBzuzGwpJiBDzq4U79blWNh3T/4f5OpUlxmz6psIJQVHo XYtG2B+mRZq+CYaZe1eKN/XyJktW5G4x5ALjHroRdGpcTdE0k7B1HbErXwXVzXs= X-Received: by 2002:a05:6512:3108:b0:50e:7410:d5b0 with SMTP id n8-20020a056512310800b0050e7410d5b0mr1823269lfb.28.1706790516272; Thu, 01 Feb 2024 04:28:36 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCUqHmfQR05i1hUXpvu6XJ3nk3m+oD1xBJvBqXZTlf9ELO0FIzgYSIGYk2juoJHsriUZdemPFUMcsxblSldot1XjoGjQYlTEj9/cHmz1yyPhENYnoVornVoJews+UxIeaV6/UpePqE8fhlFLGZ/6IEJqnWsnxhfhi73dJIm48/qjQABeFO7BajwCy3VNFbJ6SaaFjol5GDoBU5KBkpFmfO3in53/f386MFPuqx5W6Q3xwDdguIKp4a0gwjO3g0Z8rKtLd/5Wppx/1LMLloBJSD/eXkY9GYF9XUurLbeJ8p0MFmChruyxjebOIMShFLr2gpZBW/67tWCgG9120qMIfxR9OE1y/sq7IqukHBcjy7XS/Tk+8cSlWbFGcysVnDHgZOQ/f9JUx4a6dw8PRn8n6wpfyKieCQpB9mzW500GQsf4L6rNN72LDLxcKUcaLr1uoPKHDM5cULnvpr4KcsrRxZwVnqDLujLqX9ePCzITrno6abjzt9kDmoBJT0irZgl1ui1DVSB6qJrgaRoRAIuAN/MJZry4wzHEbjJg/QNiJLQMHZKftyF28MjAYbxsFG+Q1z6hlW6Tvq8OCmbUaXs83FA4NQQWwnu10ldK8J9OWOp/sCx394tMNv01Ax9+q1fcMGuFncu/prbRhJ+KNRVOc9776KW3e9OOalrM9IodriOvzhAhSKQpVYy17EyfW2JuxPAvkA== Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id vh12-20020a170907d38c00b00a3687cde34asm1335366ejc.5.2024.02.01.04.28.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Feb 2024 04:28:35 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 761A65F9DA; Thu, 1 Feb 2024 12:28:35 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Daniel Henrique Barboza , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Weiwei Li , Bin Meng , Laurent Vivier , Jiaxun Yang , Palmer Dabbelt , devel@lists.libvirt.org, Paolo Bonzini , Alistair Francis , Max Filippov , Marek Vasut , Liu Zhiwei , Thomas Huth , qemu-riscv@nongnu.org, Wainer dos Santos Moschetta , Aleksandar Rikalo , Beraldo Leal , Aurelien Jarno , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Chris Wulff , Rabin Vincent , "Edgar E . Iglesias" Subject: [PATCH 2/5] docs: mark CRIS support as deprecated Date: Thu, 1 Feb 2024 12:28:32 +0000 Message-Id: <20240201122835.1712347-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240201122835.1712347-1-alex.bennee@linaro.org> References: <20240201122835.1712347-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::134; envelope-from=alex.bennee@linaro.org; helo=mail-lf1-x134.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This might be premature but while streamling the avocado tests I realised the only tests we have are "check-tcg" ones. The aging fedora-criss-cross image works well enough for developers but can't be used in CI as we need supported build platforms to build QEMU. Does this mean the writing is on the wall for this architecture? Signed-off-by: Alex Bennée Cc: Rabin Vincent Cc: Edgar E. Iglesias Message-Id: <20230925144854.1872513-5-alex.bennee@linaro.org> Reviewed-by: Thomas Huth --- docs/about/deprecated.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index d4492b94604..82922476d72 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -183,6 +183,14 @@ Nios II CPU (since 8.2) The Nios II architecture is orphan. The ``nios2`` guest CPU support is deprecated and will be removed in a future version of QEMU. +CRIS CPU architecture (since 9.0) +''''''''''''''''''''''''''''''''' + +The CRIS architecture was pulled from Linux in 4.17 and the compiler +is no longer packaged in any distro making it harder to run the +``check-tcg`` tests. Unless we can improve the testing situation there +is a chance the code will bitrot without anyone noticing. + System emulator machines ------------------------ From patchwork Thu Feb 1 12:28:33 2024 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: 768859 Delivered-To: patch@linaro.org Received: by 2002:adf:9bca:0:b0:33a:e5bd:fedd with SMTP id e10csp355783wrc; Thu, 1 Feb 2024 04:30:06 -0800 (PST) X-Google-Smtp-Source: AGHT+IH6rAbfBPJbxdzNOtn4ZJOXyiFVK1X4EDomSZxgdQowmTo57KlJ4cyFgFD5tRM69Ucg6zP/ X-Received: by 2002:a05:620a:a96:b0:783:e2d5:a911 with SMTP id v22-20020a05620a0a9600b00783e2d5a911mr2214112qkg.48.1706790605827; Thu, 01 Feb 2024 04:30:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706790605; cv=none; d=google.com; s=arc-20160816; b=VXGBzyrYmqxDT9Yd7T4NmMZaXfpVobWUqNCzH8M88HkGsVEFZY9AGg04A3KFWsOgDN 7U7oSQGx2viUcWxRSZrBAwpvjOIDibMoIKXvwrpid6OUUVBysiGLZjQgR6MoESkl3ZO2 srWcIOuZYxi83qRrVq618uxsemBaJi9U5x5CNPGCYO0Nqa5YsxFAsiXsQLQ00aKtBH/9 r3YwkN+UzGzWMCfoGygL+5OogJUNJZ0++3LtmacMhH8Suv+mmHCC7NfQRT6/LgEJtV0L f211dk4yWFaSfGiJx6xx1UJY0J4nW15QutAe6goKQqsqCw4Gtf8dfWaBdNa8HZKDEofn kGuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=4XrdlyPxX7fzqYNhg32fjbzatjpy7oOVQl+tyM0KqaA=; fh=a831Xujg5dIePv6uAUl5SsIsSkF4hE4foX30LYhXEhg=; b=Mj6le8/atSsGKnFXNr2GIZhIOLO98mFA/thtl/yRsp3g4dcOXari6pWaTPsEnKqXj5 62pFNe9Xwf1ShjbDMROpyjfQMpB/Pk5/tgFmc7Rjdxs8QGTRVf+bfQAUk1UnktvBu71o dm8tPYA5k3/aX6uxfpMDTEUnEALqEyPyZccbP/P2c2ViGY2YSLDcR/LsoxEMvOqjbvhw wej8AL5uMbtxtJO9d1Exn3b0k09p2mG1bHOfDnHz8R/wIugs0IihXY1s0N9pWA2mbDmC auVZsyWqT8G2e7oVGupgz/5lpYWhR3JJCFYM+w6eEUNxBdpZk3bpA8HSBGB5czhUD3sn 9OsA==; darn=linaro.org ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Be7QVy0O; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org X-Forwarded-Encrypted: i=0; AJvYcCU0opYszaob6uWQk2Bg1CMPNorocxWrs0QOe7xZfNxvFOH4vwoLmewEQ2Dh8/qzCKMh3bOC1pH8rQlXT6cgNAI6 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id h11-20020a05620a10ab00b00783f1ea858dsi11057991qkk.457.2024.02.01.04.30.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 Feb 2024 04:30:05 -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=pass header.i=@linaro.org header.s=google header.b=Be7QVy0O; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rVWBR-0007qX-50; Thu, 01 Feb 2024 07:28:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rVWBO-0007oa-C3 for qemu-devel@nongnu.org; Thu, 01 Feb 2024 07:28:42 -0500 Received: from mail-lf1-x12a.google.com ([2a00:1450:4864:20::12a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rVWBM-0002B1-Mi for qemu-devel@nongnu.org; Thu, 01 Feb 2024 07:28:42 -0500 Received: by mail-lf1-x12a.google.com with SMTP id 2adb3069b0e04-51025cafb51so1315933e87.2 for ; Thu, 01 Feb 2024 04:28:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1706790519; x=1707395319; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4XrdlyPxX7fzqYNhg32fjbzatjpy7oOVQl+tyM0KqaA=; b=Be7QVy0OcsXBX1JPeM0ie50iabaVOI5Ci8al4DAkdGDMo8wWIIvs7GDvWXnuHwl9Oi Xuv+uQLz+QTkOD9H5fZOWlUPHVk/j74nk37WUWNIJoP4F1e88QLAPD8ilqz+DtbOnfFP EhJsSJ3Ip/5JXjJt1KfjZ9WBUHBzSuQauWMKhKIrgk3q9Z0jggx6THDscO/PVi7TVBYJ sxQ/DTmgPcn+tNhRbI0hc4bn9KtOp4HhwW3VBF+iZAoLaHF0RHHWWoYztBYI22iSlCVG 6rMNIejYIfdsknIfIxuYaYlwpsxgZgFstHW82edp2rkkOITU6CgI8Vil3Bqr43oEgbtp +p/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706790519; x=1707395319; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4XrdlyPxX7fzqYNhg32fjbzatjpy7oOVQl+tyM0KqaA=; b=EsrMJFE6gb6MDXOkNp7JfELyqcIdaYGUFpDQMVzgB8libgL9aUYnMBX9oBNDsz4L1l 0bNEzRRFo9e8J+aW1WOEXmlkO7jAFJXd68P/7kU5Lb2VKAx1FSOvMCdR+ksbJUp1JbJx A6XYzJzeDEp5qeMZwD69gZDyx6tflY7+Qg4nCj40lNxc3XFUr6zdq8toiIch5u20BSBQ fcgllsqtrmfzFXdFMRFLWbcOHgH1rzJS/TE2qHtGW3uzkKImPSDlB4TeKb30PHj+cuc0 Pyi9HgXFZ76wJ0LeObQGxDC1dcZMovsUgKN0q7Vm5NjCQxy9zMqTkRBYmPgdByOTV41M 1W1Q== X-Gm-Message-State: AOJu0YyI68gzANym5y0h++c6iZMUKDkl4QHib3z5Nv9OH9sq15w48UIy GfwBhMQj1QRk5060snQY14R2PtWsmwb8/0fs/kKMA2qQxuCxh+EFar4KhOvl7Xo= X-Received: by 2002:a2e:87da:0:b0:2cd:10be:cf14 with SMTP id v26-20020a2e87da000000b002cd10becf14mr2986281ljj.19.1706790519075; Thu, 01 Feb 2024 04:28:39 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCUGFVNVFdNJffY+qNu7kMHsI1cqvd+apCOb/5CIEuNPVG4EavFeHAk3NTyJHf5zaJNOfMrfgh4k7ZPJXgGfH4WrHl4hVB7GHGfmnuUlZnxeTfkdK9pW3LNcvwoxzk4ug/6biWTBAQYzZynRXXDTe0+8oFBXgwsftNgksnrkilkI1jih2IDR1Mi2AuJ5gct7o5l0aqWtpTGrm73maDTsMAU/UZwSZqtwHV1c39dFZUrsFGPC6K8F7kErwWetM7jlVqsJEYUJCV+E7mRTpGQ79btH0QZL6OybOxKvOvfZYxEfGdcsJIULa16xehR9T+BR1aPC2UCJaCU+BoqoThGbN6Y8DEDr7PSVtB66LvjqY1hrjS3FV2g1zM2kz1A2Nw6kJLCPGHuuiQV0AR+yPnROccX+mq67ySiWo3i7ZLHen2k7i6cFbXP0NQNhsbgdGapwYSZLWKbW/tk+1kkgCijNBatX6a3Z+Yz8ZrOeFJ4qMQ4fog+2NDg0UgrwFwm0ymWjKvPcHRuPlxluXz8BGYICB5pe7j+dXoZmxD+l3JUvyFV035phMHj1PpRkUYQgVZn2zig+j0MAResXhmQxoPKW20BqPnv8qIKvu4cWVmn1B0KXeZonvnfZ35NAdsIYbObWnAz/xOJnWBw= Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id h11-20020aa7c94b000000b00558a3268bbcsm6705553edt.53.2024.02.01.04.28.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Feb 2024 04:28:36 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 8E3D55F9DB; Thu, 1 Feb 2024 12:28:35 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Daniel Henrique Barboza , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Weiwei Li , Bin Meng , Laurent Vivier , Jiaxun Yang , Palmer Dabbelt , devel@lists.libvirt.org, Paolo Bonzini , Alistair Francis , Max Filippov , Marek Vasut , Liu Zhiwei , Thomas Huth , qemu-riscv@nongnu.org, Wainer dos Santos Moschetta , Aleksandar Rikalo , Beraldo Leal , Aurelien Jarno , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Chris Wulff Subject: [PATCH 3/5] configure: run plugin TCG tests again Date: Thu, 1 Feb 2024 12:28:33 +0000 Message-Id: <20240201122835.1712347-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240201122835.1712347-1-alex.bennee@linaro.org> References: <20240201122835.1712347-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::12a; envelope-from=alex.bennee@linaro.org; helo=mail-lf1-x12a.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Paolo Bonzini Commit 39fb3cfc28b ("configure: clean up plugin option handling", 2023-10-18) dropped the CONFIG_PLUGIN line from tests/tcg/config-host.mak, due to confusion caused by the shadowing of $config_host_mak. However, TCG tests were still expecting it. Oops. Put it back, in the meanwhile the shadowing is gone so it's clear that it goes in the tests/tcg configuration. Cc: Fixes: 39fb3cfc28b ("configure: clean up plugin option handling", 2023-10-18) Signed-off-by: Paolo Bonzini Message-Id: <20240124115332.612162-1-pbonzini@redhat.com> Signed-off-by: Alex Bennée --- configure | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure b/configure index 3d8e24ae011..ff058d6c486 100755 --- a/configure +++ b/configure @@ -1644,6 +1644,9 @@ fi mkdir -p tests/tcg echo "# Automatically generated by configure - do not modify" > tests/tcg/$config_host_mak echo "SRC_PATH=$source_path" >> tests/tcg/$config_host_mak +if test "$plugins" = "yes" ; then + echo "CONFIG_PLUGIN=y" >> tests/tcg/$config_host_mak +fi tcg_tests_targets= for target in $target_list; do From patchwork Thu Feb 1 12:28:34 2024 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: 768854 Delivered-To: patch@linaro.org Received: by 2002:adf:9bca:0:b0:33a:e5bd:fedd with SMTP id e10csp355770wrc; Thu, 1 Feb 2024 04:30:05 -0800 (PST) X-Google-Smtp-Source: AGHT+IFwZ0RGRqkHO1pBYgCzX1AgnSU/18CCm2LbL1xehlPSzF2t+ZZskPXeP6jDnPfxA+dFGbpR X-Received: by 2002:ac8:7e81:0:b0:42b:e7e1:92ad with SMTP id w1-20020ac87e81000000b0042be7e192admr2273828qtj.47.1706790605103; Thu, 01 Feb 2024 04:30:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706790605; cv=none; d=google.com; s=arc-20160816; b=VYox4zPGmIIwbukryVq7Jw2jhf9yog+GPb8Lt1op6WEcyX6qzfPuOZqBWXlRv9qDde em6DbmEOjY8fTUFFKVNNhHi27cW3CFQnZRQRp+agZpxAQ+GEpSTaZEfT0LiF3IXPqZY8 rc1SceYyqg1mvCffeG4ReFnHwXXQPqdx6Sz/kfSCl8Ng7NAq4ef52lfyQFl5GaxuXBBP PStbcFi9OXp7T2xPf6mxjKYQFf65kqXnCA5DL6OFsM/2Ub/DxBA8qmgrOpa/4txIUPqS IutqIqKBjlQAPw8LM4tvs0JhqBdXTF2X8E+pv/qesPFnv14y10mrtBWXU8XYLLkfKf9s U3Lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=4TIyz7/5C01pE+WSqKNz5zxOPpiT8BdSgjCe1JUQ504=; fh=5YTTj6oWclq5pmzEKDBmakwKzk+K9q2KM3lV4g0Xi6g=; b=kPkonYoVN/lePxLeXQ7TIAHEqHUISXI1k82cnc5wtPP65BmsL5GR4tPThCO2SD+CG2 fJQvA1g3bTCz4Du5h2hnvGIMVxbwA2oW8d6m836ZcweONNZav9XuPcBOopWX/3wyY1bE cpu8uzGIY4BvevXLM6bog0LvPMeIe44eljOzEjudbArJDuh2LyVI7g8NkKNrtdCOGaYR mNBxIE34i9MgUl9rsHXGzD/uvyEOI9jaJcCIXbSlqhQPtcXC99dXW1t1+7c2oSlRLG4E H7PKgg2A3Z3osQ35HrdS9epovv+nRybfEfKumVgYCPsVCQ8KCqkFEH/QCilYh6vR1zQ9 Foew==; darn=linaro.org ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=iKFzcPNB; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org X-Forwarded-Encrypted: i=0; AJvYcCUXrr/GSvkKe+Spx0WHT2zsM9nVDe/lA3/9D+hg40TLSqUAkg+4nHqUPHKk42Nn2rMD3El1pZB7F9YDscLRiosR Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id c11-20020a05622a058b00b0042a7431a4b7si14359225qtb.240.2024.02.01.04.30.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 Feb 2024 04:30:05 -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=pass header.i=@linaro.org header.s=google header.b=iKFzcPNB; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rVWBR-0007qy-Jf; Thu, 01 Feb 2024 07:28:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rVWBP-0007pQ-KM for qemu-devel@nongnu.org; Thu, 01 Feb 2024 07:28:43 -0500 Received: from mail-ed1-x52e.google.com ([2a00:1450:4864:20::52e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rVWBN-0002Av-C2 for qemu-devel@nongnu.org; Thu, 01 Feb 2024 07:28:43 -0500 Received: by mail-ed1-x52e.google.com with SMTP id 4fb4d7f45d1cf-55c2cf644f3so1113389a12.1 for ; Thu, 01 Feb 2024 04:28:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1706790519; x=1707395319; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4TIyz7/5C01pE+WSqKNz5zxOPpiT8BdSgjCe1JUQ504=; b=iKFzcPNBT4hBJlKNTH47w2k7xk2xnvjUB0Lm5z+IxjbJfy/kbFDSE4MWl9oqQwJO2B zBcuNSvEul1e45KiHJ/gMvsc7/HfMocY4YC0o4AxiF91KDlf0QlKzOkj0EIAWUZf4EFv 77ZoAGIo4/aVBR35qYlDrqZ9scTZrnB8n0Jt52pmf9ab2sCGrdi56FAj7raReni6JmSs d9kgPIJgaMZey0sPkIGfsy4VkMwloiU4LteTRJf6fSDlS+6KQ1ohkJCW8v6lBJAUQ9WB kh9u8YuH7u+O7Ozu3sYRa0W2mvjR30Czo/wBbU8gTg35rKezoc8zT9AWt1WYypMy8Xl4 tRiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706790519; x=1707395319; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4TIyz7/5C01pE+WSqKNz5zxOPpiT8BdSgjCe1JUQ504=; b=ldu/uD9g0KyD8Qc6z/r4hBn65F6z3AvRoU21Ok4bXJj8dCLXYoQyoE553KrqZMgi9f RbZLhMoY0fpzBSHN0REeR9a1juppHfV50um242T9F8x8AZAK0mMkXl763/CZ6ET/mlLy h4QL9x+0ScJABPLvQ+DBMDwJhd3dE34GYf3LsB9RdxXtjGmAL8zpxLFOdNE7yATT6i/F tUcBYXf2BXzVuMfXhGRjXML27/1UqXAOvROClhYr9fIXOd9DcxRaBxIAsd0qM8kFiUH8 jIQcV+Eo8BGsEQbrye5X6nrQvHTyIgZojmsiFN02zhm+IMJV4rth2UykoYkGQNGGQI7N F1TQ== X-Gm-Message-State: AOJu0YwAXaq5/BDc7kCSmCz/3dXQlgIBXpm+rDkILhGnRl/K9wDuOFMa rlQY0n8AtRbEPA87EQRGsKqhc2DomIOnba7qYeZMMDNcFT7scsJjnU/V35LnGBw= X-Received: by 2002:a50:c35a:0:b0:55e:dbb8:4c6b with SMTP id q26-20020a50c35a000000b0055edbb84c6bmr3262632edb.42.1706790518811; Thu, 01 Feb 2024 04:28:38 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCXV63BBOD1doNfROSikQ+uHSekeSYo5CJveFGyWQ+kPkTaqLMFJZRuoSpP65MHERodTnenmx8G/AjLsGYLHOawz42s0Hk1E/qCLREc4mQVL2IBtyjHj8Ek/AdTy4YeY3WNBrlQtgv9jl2gqRqffF/pUwX4WQekAEWDopbI4KcrGyXi+3RuRRhdoFjl3R6t52FhAOJitPp9LND9aJ++sGJRLsUEizQt2GSRDd/j3kTkQVPtA5HcXA2dnG677nzvUTq8DI6/MsxaLprrdk7FUTlXvBXht2QC1Ypp+XmwRDEx/P1ngzbuD7Y/HgiHHWxYjPLbkZ4h3P2tHLVtUc/EVALkxYY4peXwzJ9a7jr7halPZkSzOBOHRJ7/M4HjFMG+zuEqXAM7X3njgAUud0U3e6yrYYXlIKI8N5M/CbdxVVH3PH9NV1BcdaQcc+2lPyREEutUKVxNeCI4kg7loti/s0AMaS73fqBWGvLvkFxBQmVp84EgSSH15eMRJ2JdL/YD7eOC9BAnCQJEXyqFfVslffqlj47LPMEPAlSiFD9vAAcKqZ/IcaC8VBOku4vqWHd4sEXWbqk6vqY9riklq8CnyfvMIbPiXCbv0fOW2dRzixEU3/wUwibpIZzqmbnw4QFmyZ0/hlWd3m3A= Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id n17-20020aa7c791000000b0055f283314e1sm3153680eds.43.2024.02.01.04.28.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Feb 2024 04:28:36 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id A41CA5F9DC; Thu, 1 Feb 2024 12:28:35 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Daniel Henrique Barboza , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Weiwei Li , Bin Meng , Laurent Vivier , Jiaxun Yang , Palmer Dabbelt , devel@lists.libvirt.org, Paolo Bonzini , Alistair Francis , Max Filippov , Marek Vasut , Liu Zhiwei , Thomas Huth , qemu-riscv@nongnu.org, Wainer dos Santos Moschetta , Aleksandar Rikalo , Beraldo Leal , Aurelien Jarno , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Chris Wulff Subject: [PATCH 4/5] Revert "hw/elf_ops: Ignore loadable segments with zero size" Date: Thu, 1 Feb 2024 12:28:34 +0000 Message-Id: <20240201122835.1712347-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240201122835.1712347-1-alex.bennee@linaro.org> References: <20240201122835.1712347-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52e; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52e.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This regressed qemu-system-xtensa: TEST test_load_store on xtensa qemu-system-xtensa: Some ROM regions are overlapping These ROM regions might have been loaded by direct user request or by default. They could be BIOS/firmware images, a guest kernel, initrd or some other file loaded into guest memory. Check whether you intended to load all this guest code, and whether it has been built to load to the correct addresses. The following two regions overlap (in the memory address space): test_load_store ELF program header segment 1 (addresses 0x0000000000001000 - 0x0000000000001f26) test_load_store ELF program header segment 2 (addresses 0x0000000000001ab8 - 0x0000000000001ab8) make[1]: *** [Makefile:187: run-test_load_store] Error 1 This reverts commit 62570f1434160d356311e1c217537e24a4ac85cd. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth --- include/hw/elf_ops.h | 75 +++++++++++++++++++++----------------------- 1 file changed, 36 insertions(+), 39 deletions(-) diff --git a/include/hw/elf_ops.h b/include/hw/elf_ops.h index 3e966ddd5a1..9c35d1b9da6 100644 --- a/include/hw/elf_ops.h +++ b/include/hw/elf_ops.h @@ -427,16 +427,6 @@ static ssize_t glue(load_elf, SZ)(const char *name, int fd, file_size = ph->p_filesz; /* Size of the allocated data */ data_offset = ph->p_offset; /* Offset where the data is located */ - /* - * Some ELF files really do have segments of zero size; - * just ignore them rather than trying to set the wrong addr, - * or create empty ROM blobs, because the zero-length blob can - * falsely trigger the overlapping-ROM-blobs check. - */ - if (mem_size == 0) { - continue; - } - if (file_size > 0) { if (g_mapped_file_get_length(mapped_file) < file_size + data_offset) { @@ -540,38 +530,45 @@ static ssize_t glue(load_elf, SZ)(const char *name, int fd, *pentry = ehdr.e_entry - ph->p_vaddr + ph->p_paddr; } - if (load_rom) { - g_autofree char *label = - g_strdup_printf("%s ELF program header segment %d", - name, i); - - /* - * rom_add_elf_program() takes its own reference to - * 'mapped_file'. - */ - rom_add_elf_program(label, mapped_file, data, file_size, - mem_size, addr, as); - } else { - MemTxResult res; - - res = address_space_write(as ? as : &address_space_memory, - addr, MEMTXATTRS_UNSPECIFIED, - data, file_size); - if (res != MEMTX_OK) { - goto fail; - } - /* - * We need to zero'ify the space that is not copied - * from file - */ - if (file_size < mem_size) { - res = address_space_set(as ? as : &address_space_memory, - addr + file_size, 0, - mem_size - file_size, - MEMTXATTRS_UNSPECIFIED); + /* Some ELF files really do have segments of zero size; + * just ignore them rather than trying to create empty + * ROM blobs, because the zero-length blob can falsely + * trigger the overlapping-ROM-blobs check. + */ + if (mem_size != 0) { + if (load_rom) { + g_autofree char *label = + g_strdup_printf("%s ELF program header segment %d", + name, i); + + /* + * rom_add_elf_program() takes its own reference to + * 'mapped_file'. + */ + rom_add_elf_program(label, mapped_file, data, file_size, + mem_size, addr, as); + } else { + MemTxResult res; + + res = address_space_write(as ? as : &address_space_memory, + addr, MEMTXATTRS_UNSPECIFIED, + data, file_size); if (res != MEMTX_OK) { goto fail; } + /* + * We need to zero'ify the space that is not copied + * from file + */ + if (file_size < mem_size) { + res = address_space_set(as ? as : &address_space_memory, + addr + file_size, 0, + mem_size - file_size, + MEMTXATTRS_UNSPECIFIED); + if (res != MEMTX_OK) { + goto fail; + } + } } } From patchwork Thu Feb 1 12:28:35 2024 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: 768857 Delivered-To: patch@linaro.org Received: by 2002:adf:9bca:0:b0:33a:e5bd:fedd with SMTP id e10csp355778wrc; Thu, 1 Feb 2024 04:30:06 -0800 (PST) X-Google-Smtp-Source: AGHT+IGuH8K9aDmnPNbIBcUnWxUF0fY90QxbQeja1FHOvlRQ6rD41d01n8/emuj7FmpP0iFUrC7O X-Received: by 2002:a05:620a:688b:b0:783:e3d6:d917 with SMTP id rv11-20020a05620a688b00b00783e3d6d917mr2801982qkn.33.1706790605854; Thu, 01 Feb 2024 04:30:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706790605; cv=none; d=google.com; s=arc-20160816; b=x+BOSCZ3kDk0xmKPMIDFyfXbPUeaYSbDvQUng/mBNGCqtZE3lQpVpE+mjKDZUglUco 3cV22kbfvHeNibljjzSboUEgyIYcw3ZRVupvN1NVDGT5E4l2MdGM++2s+QE8hBS07Ey+ BtaOoKNhCueOXnGh8641yH3nQElFcOGFgLQ64bPrqQ7jWc+uVNhdepx4Jyq7HCFzuMsr xQFlcyJ84Zpe4ZdOEczocxJABjK8ShwBiPuibJNh8fGsPfCnOc0DcfM8BJoKtmPcnwk6 62cEfmoBd3wdXWkVacoNzkbpnbFTotsnU/eoFe3bZR+KBNsyEZ1Mhdavj1yEXprP8Fdp 0/lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=j3+17aNm4Vprn5dUFdZGH0//LOKhFu0gJMaab5yZQOU=; fh=1UYO4C7G6OQDuztcaqir7ziFuOvx5Clgt7YQO/Xf02g=; b=XfM6ZPdbriAZdv9YW1SMDydtS5PhzPu4wsanEE/6y4i+MheeA6pyR+nBHOEoicZ8LN V/WH1mQad9srIEd/aWj9QuSHGbiZ/UloexE6bj10pjZffaMoQSjeAVIw09nRRaC3LgJe Ee3WqhIJRFDDQ/vJbskqJ0a9nsD/sJYUghZct+KhU5QtWsDu8/Dp2bUK1Hv3B3NmXLpu C3BNHRpUoc6a7S8hTT8dJH34sCjsZWeLG4Dd4oIe5scNbQCVCf2HmNQ16KMVFOZwb1FM /a0PNGCNycB9j8mkORikClm8f/AFEC8QAS/i3MwZS1mdOAztR9nliVL0gfHm3mqxKAL3 1vyA==; darn=linaro.org ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="xIioCV5/"; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org X-Forwarded-Encrypted: i=0; AJvYcCVrIsj/Dcmblf8Em+hfbYIQp9404G/6y4edpCafah07OCMSBrl9iPpisP4yfEuk8cuXOr0g1aJGcRxUELIyHFGi Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p26-20020a05620a22fa00b00783f53a5507si10610000qki.741.2024.02.01.04.30.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 Feb 2024 04:30:05 -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=pass header.i=@linaro.org header.s=google header.b="xIioCV5/"; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rVWBT-0007ry-CQ; Thu, 01 Feb 2024 07:28:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rVWBR-0007qZ-4T for qemu-devel@nongnu.org; Thu, 01 Feb 2024 07:28:45 -0500 Received: from mail-ed1-x533.google.com ([2a00:1450:4864:20::533]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rVWBP-0002Bf-2C for qemu-devel@nongnu.org; Thu, 01 Feb 2024 07:28:44 -0500 Received: by mail-ed1-x533.google.com with SMTP id 4fb4d7f45d1cf-55a90a0a1a1so1234211a12.0 for ; Thu, 01 Feb 2024 04:28:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1706790521; x=1707395321; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=j3+17aNm4Vprn5dUFdZGH0//LOKhFu0gJMaab5yZQOU=; b=xIioCV5/4kypAF5I4N0sFp48lHBk+K1/3Zf1HiT7ZoZ5tddrTcYIMiJUB8etzGz1D0 U2VaIHAlWSEIpr5IGjwBze7BDCn5Op6HdZQZ63vCkXKN93fRAjqxeWEtNI9ua79sikTY p2EqCUJBaWVSGwHnQMtSN7xcN9ZPHVWLzgfo4Cb45vOIZeF8vcldvMSHlO13EL9ZuHW/ vefVcwolh8CCVDzP3uXBp9da4jp8XB9MT934LS1nJ90E3LWPMuX8BX+t1sKnvoG8zaqU Vfg5abR1uSov1Af7MJUWNFEHOh0uPWcHqfxYj2tt56v70Ne9oZh9Nj3EllI4Ivdw76bf BTSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706790521; x=1707395321; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=j3+17aNm4Vprn5dUFdZGH0//LOKhFu0gJMaab5yZQOU=; b=SnqrpnkivRPOLrnDyFAn2j1JWkoaQViO2WYkl48hC1GVKRHpB1JmablcA+642k+8SF BhPWR7rTt047RQKmLGnkDDvqiyBoFpdb//gk21MIMbeXDrn3WzA54EJep5mq2iiLoVLY hr/wjlCYEREGDQuc1JK/bLc80A6+uBgdYXaaQWgi3KydtrRYFdtekDKyf0sBFfJZ99jP iqtdtwhGdu1MW8flCtdEyRCdZ23uE+MxgU1TXSMqSTt0NNLqkwLQdjIyrHCTPw29Wka9 e1jyyI7XwBAqpi9w8IoO3C+ALsarSY1Ymgy8fNflVrFpd5eLFeq/gOoXdW9vOCto8FQ5 FZaw== X-Gm-Message-State: AOJu0YwkvAAz/S46DAaJdbHWYi3JIzQkaiuNAOolIu+JbEg3tk102fFF VnbKF7bYrplEkyn0gI9tKVOtoyR/LT+xPFRPOGet/ZH/y7g68ATU6ABDMPjiJE8= X-Received: by 2002:a05:6402:4584:b0:55f:a534:cac9 with SMTP id ig4-20020a056402458400b0055fa534cac9mr2654210edb.5.1706790521395; Thu, 01 Feb 2024 04:28:41 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCUnNVDM+JdlDDIQig7S6oprTdpmYSyTZijeGzcAI+jkLqJ1FqUcmr3lHzWTvaWs6+7pIaS0izkUppDkh2b5xcrOJwjXMar9S3OKr4SIIFh73tWmBrh6fX16mTRi1qGNADIFwHOjBCGcHRR/cRU0gwlhVOxJEnrgCYIQJjX2WvLkssMTzFC23h5XguiqGhzVffzcYqf6qp2+lEH/GtgZIBeyxtF1HZxqdWlJjWKMjs6ZaQNhg9ZbEvZEFFFkzCseUNIIAgsj2a7Z43uIy6vIRCUjx1dySRh21n0t133gnT9WZU+PQMxjCM8Hn5hcyhfK4yB7XgSG3NotnX8uKH4IUN4vBUPBswWwzcDGRx/Jm15pMUx/f+N3px1QajvMd+3jPz3mtL+NFm/EGQAbpoylSknRrbJyxQiPjTwVFS7mjUpdAh2UGS8KLNeAoLLfH0WaMQ6+YU7ML9ureVgUs09wHFmsa7vzskLpOnt2BKMecUwKwavtJdDKvVId/w0Gdwfy4bSKZfHCNEO5goCFJzswkNmiXfDaJEhVLTyXumJfFl+1TsgGDbFcCf5JWPnaUlI7unvtrQshkLZLPzhy5pJe+cTQLNqhNP0zP5yRcgLfhCm8KuPWdA9YX9GwxyOSx+xOK8HHkCds6LA= Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id p14-20020a056402500e00b0055c67e6454asm6815985eda.70.2024.02.01.04.28.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Feb 2024 04:28:39 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id C67425F9DD; Thu, 1 Feb 2024 12:28:35 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Daniel Henrique Barboza , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Weiwei Li , Bin Meng , Laurent Vivier , Jiaxun Yang , Palmer Dabbelt , devel@lists.libvirt.org, Paolo Bonzini , Alistair Francis , Max Filippov , Marek Vasut , Liu Zhiwei , Thomas Huth , qemu-riscv@nongnu.org, Wainer dos Santos Moschetta , Aleksandar Rikalo , Beraldo Leal , Aurelien Jarno , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Chris Wulff Subject: [PATCH 5/5] kconfig: use "select" to enable semihosting Date: Thu, 1 Feb 2024 12:28:35 +0000 Message-Id: <20240201122835.1712347-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240201122835.1712347-1-alex.bennee@linaro.org> References: <20240201122835.1712347-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::533; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x533.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Paolo Bonzini Just like all other dependencies, these can be expressed in Kconfig files rather than in the default configurations. Signed-off-by: Paolo Bonzini Acked-by: Alistair Francis Message-Id: <20240129115809.1039924-1-pbonzini@redhat.com> Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth --- configs/devices/m68k-softmmu/default.mak | 2 -- configs/devices/mips-softmmu/common.mak | 3 --- configs/devices/nios2-softmmu/default.mak | 2 -- configs/devices/riscv32-softmmu/default.mak | 2 -- configs/devices/riscv64-softmmu/default.mak | 2 -- configs/devices/xtensa-softmmu/default.mak | 2 -- target/m68k/Kconfig | 1 + target/mips/Kconfig | 1 + target/nios2/Kconfig | 1 + target/riscv/Kconfig | 2 ++ target/xtensa/Kconfig | 1 + 11 files changed, 6 insertions(+), 13 deletions(-) diff --git a/configs/devices/m68k-softmmu/default.mak b/configs/devices/m68k-softmmu/default.mak index 7f8619e4278..8dcaa28ed38 100644 --- a/configs/devices/m68k-softmmu/default.mak +++ b/configs/devices/m68k-softmmu/default.mak @@ -1,7 +1,5 @@ # Default configuration for m68k-softmmu -CONFIG_SEMIHOSTING=y - # Boards: # CONFIG_AN5206=y diff --git a/configs/devices/mips-softmmu/common.mak b/configs/devices/mips-softmmu/common.mak index 7da99327a77..1a853841b27 100644 --- a/configs/devices/mips-softmmu/common.mak +++ b/configs/devices/mips-softmmu/common.mak @@ -1,8 +1,5 @@ # Common mips*-softmmu CONFIG defines -# CONFIG_SEMIHOSTING is always required on this architecture -CONFIG_SEMIHOSTING=y - CONFIG_ISA_BUS=y CONFIG_PCI=y CONFIG_PCI_DEVICES=y diff --git a/configs/devices/nios2-softmmu/default.mak b/configs/devices/nios2-softmmu/default.mak index 1bc4082ea99..e130d024e62 100644 --- a/configs/devices/nios2-softmmu/default.mak +++ b/configs/devices/nios2-softmmu/default.mak @@ -1,7 +1,5 @@ # Default configuration for nios2-softmmu -CONFIG_SEMIHOSTING=y - # Boards: # CONFIG_NIOS2_10M50=y diff --git a/configs/devices/riscv32-softmmu/default.mak b/configs/devices/riscv32-softmmu/default.mak index d847bd5692e..94a236c9c25 100644 --- a/configs/devices/riscv32-softmmu/default.mak +++ b/configs/devices/riscv32-softmmu/default.mak @@ -3,8 +3,6 @@ # Uncomment the following lines to disable these optional devices: # #CONFIG_PCI_DEVICES=n -CONFIG_SEMIHOSTING=y -CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y # Boards: # diff --git a/configs/devices/riscv64-softmmu/default.mak b/configs/devices/riscv64-softmmu/default.mak index bc69301fa4a..3f680594484 100644 --- a/configs/devices/riscv64-softmmu/default.mak +++ b/configs/devices/riscv64-softmmu/default.mak @@ -3,8 +3,6 @@ # Uncomment the following lines to disable these optional devices: # #CONFIG_PCI_DEVICES=n -CONFIG_SEMIHOSTING=y -CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y # Boards: # diff --git a/configs/devices/xtensa-softmmu/default.mak b/configs/devices/xtensa-softmmu/default.mak index 4fe1bf00c94..49e4c9da88c 100644 --- a/configs/devices/xtensa-softmmu/default.mak +++ b/configs/devices/xtensa-softmmu/default.mak @@ -1,7 +1,5 @@ # Default configuration for Xtensa -CONFIG_SEMIHOSTING=y - # Boards: # CONFIG_XTENSA_SIM=y diff --git a/target/m68k/Kconfig b/target/m68k/Kconfig index 23debad519a..9eae71486ff 100644 --- a/target/m68k/Kconfig +++ b/target/m68k/Kconfig @@ -1,2 +1,3 @@ config M68K bool + select SEMIHOSTING diff --git a/target/mips/Kconfig b/target/mips/Kconfig index 6adf1453548..eb19c94c7d4 100644 --- a/target/mips/Kconfig +++ b/target/mips/Kconfig @@ -1,5 +1,6 @@ config MIPS bool + select SEMIHOSTING config MIPS64 bool diff --git a/target/nios2/Kconfig b/target/nios2/Kconfig index 1529ab8950d..c65550c861a 100644 --- a/target/nios2/Kconfig +++ b/target/nios2/Kconfig @@ -1,2 +1,3 @@ config NIOS2 bool + select SEMIHOSTING diff --git a/target/riscv/Kconfig b/target/riscv/Kconfig index b9e5932f13f..adb7de3f37d 100644 --- a/target/riscv/Kconfig +++ b/target/riscv/Kconfig @@ -1,5 +1,7 @@ config RISCV32 bool + select ARM_COMPATIBLE_SEMIHOSTING # for do_common_semihosting() config RISCV64 bool + select ARM_COMPATIBLE_SEMIHOSTING # for do_common_semihosting() diff --git a/target/xtensa/Kconfig b/target/xtensa/Kconfig index a3c8dc7f6d7..5e46049262d 100644 --- a/target/xtensa/Kconfig +++ b/target/xtensa/Kconfig @@ -1,2 +1,3 @@ config XTENSA bool + select SEMIHOSTING