From patchwork Wed Aug 7 11:40:54 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: 13756168 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DA29FC52D6F for ; Wed, 7 Aug 2024 11:42:07 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sbf2c-0006Nf-OP; Wed, 07 Aug 2024 07:41:18 -0400 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 1sbf2Y-000662-9P for qemu-devel@nongnu.org; Wed, 07 Aug 2024 07:41:14 -0400 Received: from mail-lf1-x12f.google.com ([2a00:1450:4864:20::12f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sbf2Q-0003AV-80 for qemu-devel@nongnu.org; Wed, 07 Aug 2024 07:41:12 -0400 Received: by mail-lf1-x12f.google.com with SMTP id 2adb3069b0e04-530c2e5f4feso1726978e87.0 for ; Wed, 07 Aug 2024 04:41:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1723030863; x=1723635663; 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=NIuSypWDg9XREmCR8A6U0uVblD/PqIkJ2Iws02lA4d8=; b=DTpmJ2C2wtL6DIGpH5+aapz+6yZMvVdJtLMMK2+d1UKX5UHF6z86vdIdvNEd46X60c sugYAq3km6i5M/fV5FcDU/nGwe+Jr45Y3LuraIn83Rc6Ku0DUo0PCz9gDMX9KFqdM2PH FZ+/yBVHnRIk1sSSMXzE/Mfvfg8YZPW6xes8/Iw+XUyfjFx0pB4/FpgW1yaKc1V+b6TZ 2D35gdk0p9xjRsmRgtnloppCsG7ZRCjYIosYVGPC4kTZPXAyvR/9nBssicAP4+bwN3ev ECWHx5uMqNiDRb50IOJW1agsqllZ9r8bQFegXJGVObis82ihuphDlGBbrOUCqnREYTBA u2+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723030863; x=1723635663; 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=NIuSypWDg9XREmCR8A6U0uVblD/PqIkJ2Iws02lA4d8=; b=YA2yacBUxP4XVMARhyDbejsxmFeQAR0mIpqnSOdYfyn3uB9WKltUM9aXuJvkKUO8Ve xVXaWmDIH6PCctg/GB0vXuBZo+V8WIAMH7EJwTlJ4C4PkzmThVOPGJhWMP0KO5z1K6j/ HxUYPGHAP2MRF3i1LFLWuPc84HEjqSAJm4JJ1zGpVvv2ztr1mlbbKt7YQtcz4cinwSVX DuTBeeGn594KrBVfxMgo0jpc+tzzLe4CwbBSPKGxuiYaJl3M7A8sXoDfoOCCQYt09GUS nVzeNzYnAAynCKaq5impsbvY8C3kuv/7z2f7jFsRdu6aUe/4GkkC+YWMTqc/RHAwkj45 ne1w== X-Gm-Message-State: AOJu0Yy3aiIoFSWQz2ULk5HHYweHFhbO7R4+xYbEOgrT7CswMmpfgXrx 2wrVBCclB3Z5NqoAwunavHiBzZJAxkB8MP4PYF68ZGVXVvsbNn7Gy5ORVAFok38= X-Google-Smtp-Source: AGHT+IEAkPcegYL7qZbgKzviMSOfeP+HNgfUJLPPcdlpaWw4tbtZ8EFM+49OGoV0U77RtQYWRC8neg== X-Received: by 2002:a05:6512:3c94:b0:52e:97b3:42a1 with SMTP id 2adb3069b0e04-530bb378859mr13292253e87.24.1723030862663; Wed, 07 Aug 2024 04:41:02 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5b83960f313sm6951570a12.17.2024.08.07.04.41.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Aug 2024 04:41:01 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 02FB65F929; Wed, 7 Aug 2024 12:41:00 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Ma?= =?utf-8?q?thieu-Daud=C3=A9?= , Thomas Huth , Beraldo Leal , Yoshinori Sato , =?utf-8?q?Alex_Benn=C3=A9e?= , Paolo Bonzini , Cleber Rosa Subject: [PATCH 1/6] tests/avocado: Re-enable gdbsim-r5f562n8 testing U-Boot Date: Wed, 7 Aug 2024 12:40:54 +0100 Message-Id: <20240807114059.2339021-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240807114059.2339021-1-alex.bennee@linaro.org> References: <20240807114059.2339021-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::12f; envelope-from=alex.bennee@linaro.org; helo=mail-lf1-x12f.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Philippe Mathieu-Daudé We disabled all RX tests on commit 9b45cc9931 ("docs/devel: rationalise unstable gitlab tests under FLAKY_TESTS") for being flaky. However I don't recall the U-Boot test to fail (the problematic line checking the 'version' string is already commented out), and I'm running this test reliably, so re-enable it. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Yoshinori Sato Message-Id: <20240801172332.65701-1-philmd@linaro.org> Signed-off-by: Alex Bennée --- tests/avocado/machine_rx_gdbsim.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/avocado/machine_rx_gdbsim.py b/tests/avocado/machine_rx_gdbsim.py index 412a7a5089..a83873b738 100644 --- a/tests/avocado/machine_rx_gdbsim.py +++ b/tests/avocado/machine_rx_gdbsim.py @@ -22,8 +22,6 @@ class RxGdbSimMachine(QemuSystemTest): timeout = 30 KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 ' - @skipUnless(os.getenv('QEMU_TEST_FLAKY_TESTS'), 'Test is unstable on GitLab') - def test_uboot(self): """ U-Boot and checks that the console is operational. From patchwork Wed Aug 7 11:40:55 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: 13756170 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 070EAC52D6F for ; Wed, 7 Aug 2024 11:42:34 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sbf2Y-00064E-5J; Wed, 07 Aug 2024 07:41:14 -0400 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 1sbf2V-00061q-2V for qemu-devel@nongnu.org; Wed, 07 Aug 2024 07:41:11 -0400 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sbf2P-0003Ae-Pq for qemu-devel@nongnu.org; Wed, 07 Aug 2024 07:41:10 -0400 Received: by mail-ej1-x62d.google.com with SMTP id a640c23a62f3a-a7a843bef98so187610166b.2 for ; Wed, 07 Aug 2024 04:41:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1723030864; x=1723635664; 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=OOKODoxVh76RIA5fIE8MFN9yKYyVPsEMcCL2+a1GCQw=; b=J3FdjDolgP+oAiBhPmoxHhO2EXfwSZ3WrXzn+8YjIZnX85yAFLnzOFKQoNDDWkMwTQ 8dIJrIyd0Qf0EC3UlZgNldeESHLtdMSqwQQ2a0ncIxu2FW4Bqv6FYSCo8Y/NpJTPCjwG tipZEq8A3QvP9/bAOYGN90PFsb5lCCgtltou6rTQpvwhPbnAdBmYCwqAzvtR4+DKEb7d RCda6ddrey97ubbZ9WYwXueHVqim2kh7VDLUceOJsKtpXoBsHt/tny4uOd+PnfV5c0eV SUBhtu5BvbGRRlvKTDxY22iNTJKOrKfe+JMd9Nhwgi+eZA3cDUzKvSJlVhBV1BGCvF1A xEBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723030864; x=1723635664; 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=OOKODoxVh76RIA5fIE8MFN9yKYyVPsEMcCL2+a1GCQw=; b=aY2QHC8ci4QMUbHvy70MIeREyYUq/NrcmyeEFKGS+4Z4IXgrMRWXBywaLWkyKYweuP B3KbkPzDIKjNEH6df9L6gsq5wtztP7DRhcxIhGZ4vBWHvChMU05sYJs17g2cNnYepZh5 d48dVc19Rjx9DF/fFVUaaDcm3YuxaXmg4ICu3UYjREVYTtgIFaQWQ8N8LTsY7ueHScbQ YSt6JPxBd0U473V8cFNaQ0UPkueGVRg7I5NY/8iVqxCi4dcr+IonsH+dwqkxv/r+Txqu lC4zbx1THicXGWyvD2cM5cT23cezitUEVbSTOmMVjKEtlP33kpQMSSZuckQZYoa/XTpg Dwsw== X-Gm-Message-State: AOJu0Yz6G3h382NNZ6fnhX0pTK0Zueuw75096bn62fK5rO1FsdwCDMnI XGSlAKRNah5oRESjBnU0QPTTWwMjrybRA/QaKTqJbFGIzcFh3L3Y1qFXodnaUhs= X-Google-Smtp-Source: AGHT+IFDR13CAqTrwOEYRvQNizP3bFNizsBPdRjCyziBwQ4ym2FSlWWYsNdQ8xaghAOY6/eGcjUoYw== X-Received: by 2002:a17:907:6e9f:b0:a77:d441:c6f1 with SMTP id a640c23a62f3a-a7dc4e6cc2dmr1366667666b.33.1723030863477; Wed, 07 Aug 2024 04:41:03 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a8067efcf0fsm144174566b.145.2024.08.07.04.41.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Aug 2024 04:41:01 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 172525F92A; Wed, 7 Aug 2024 12:41:00 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Ma?= =?utf-8?q?thieu-Daud=C3=A9?= , Thomas Huth , Beraldo Leal , Yoshinori Sato , =?utf-8?q?Alex_Benn=C3=A9e?= , Paolo Bonzini , Cleber Rosa , Richard Henderson Subject: [PATCH 2/6] Makefile: trigger re-configure on updated pythondeps Date: Wed, 7 Aug 2024 12:40:55 +0100 Message-Id: <20240807114059.2339021-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240807114059.2339021-1-alex.bennee@linaro.org> References: <20240807114059.2339021-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62d; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62d.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org If we add additional deps for meson we need to ensure we trigger a reconfigure to make sure everything is set up. Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20240731140232.22193-1-alex.bennee@linaro.org> --- v2 - split line with continuation --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 02a257584b..917c9a34d1 100644 --- a/Makefile +++ b/Makefile @@ -78,7 +78,8 @@ x := $(shell rm -rf meson-private meson-info meson-logs) endif # 1. ensure config-host.mak is up-to-date -config-host.mak: $(SRC_PATH)/configure $(SRC_PATH)/scripts/meson-buildoptions.sh $(SRC_PATH)/VERSION +config-host.mak: $(SRC_PATH)/configure $(SRC_PATH)/scripts/meson-buildoptions.sh \ + $(SRC_PATH)/pythondeps.toml $(SRC_PATH)/VERSION @echo config-host.mak is out-of-date, running configure @if test -f meson-private/coredata.dat; then \ ./config.status --skip-meson; \ From patchwork Wed Aug 7 11:40:56 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: 13756173 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 11793C3DA7F for ; Wed, 7 Aug 2024 11:43:27 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sbf2Z-00068b-Ay; Wed, 07 Aug 2024 07:41:15 -0400 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 1sbf2W-00062o-O9 for qemu-devel@nongnu.org; Wed, 07 Aug 2024 07:41:13 -0400 Received: from mail-lf1-x136.google.com ([2a00:1450:4864:20::136]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sbf2T-0003B4-IH for qemu-devel@nongnu.org; Wed, 07 Aug 2024 07:41:11 -0400 Received: by mail-lf1-x136.google.com with SMTP id 2adb3069b0e04-52f04150796so2583995e87.3 for ; Wed, 07 Aug 2024 04:41:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1723030868; x=1723635668; 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=pTfCk64r8q3pxcxN1PtSEYt96mHUVpiaIdaNgLQ6haU=; b=Ryj5yRA5w3eApM83TRw2Jo1I7tyqKMLoshIFyUoA0XyJjlrFgJSCWwvUqAc7VF9wcG kg6Igraogta1fNDYzIq7hjbvsjsMuPJd1H5HmsuRtpQVArvWIg+xFx90o7CT6nCeb7i5 UIwbBB7rExRiptCxTiU747/ga2MV/kOkCHf12QCYRvqwvIVQiTOEy64pTRMPHr/MN6No oY7ghscLsljCU1SglW2vWm3j1xnjCd9pKq56Vy5qTPkB9iYoVV0dut8RDs3uxNMc/j14 0MPP79jxtEbstKsND9cPTZjOfT3bXE/aF254FVKBrdgXkFlRXsbc5SkB0ZZ9iAwS3Kyn HOGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723030868; x=1723635668; 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=pTfCk64r8q3pxcxN1PtSEYt96mHUVpiaIdaNgLQ6haU=; b=AxoBrGkJZaiYL4X4glRtCPGcdHuv/DTtcmeCYX8Hg9xJHV6FLGQ4/6H0hlZRs6vkO2 Qwa+AQ2b0EF9LRgdTCLu/GtwtGNRNMZpsPQOGdGlsC4OObEluEFv101lchiekoVl9GKk adJMRZ0/0rn2SYLO61MVNkGglnH5wFLVLBIPclUGLIa11HKo5SXNTbOyah6l4RBvK9oq fbUI1SvKfZpBQtC0ERGGJQva8TB4yEDB+eQVXpaip/Rxq+UgQMAH3/XyskUBGBgCznLf zlzHNJ5b3wRPWjrDuZFXlu/JnwkH/ufheojD3Qt+vHOlJ/7ZsLcfy8qmvhDYWzWHDHG0 aBvg== X-Gm-Message-State: AOJu0YyTwPAVWEhtcAnYgsAKIEmuIPgJugMJTFZNzRtEckxBfa7oA1UF /9wcOZuu9CD+2O02dVCXHF0eOR4uG4rmAIC9pbad5uaSSr/d3wGCLq0roGfZ8WE= X-Google-Smtp-Source: AGHT+IECak3W7ZhApmMH6jRsCuYSU3oEitW7MAeF+7eSMLpbzH8qePAkgso1AIK8NYf6uG1Y39UYKg== X-Received: by 2002:a05:6512:3f0d:b0:52c:e040:7d9 with SMTP id 2adb3069b0e04-530bb3b4a15mr11695346e87.59.1723030867011; Wed, 07 Aug 2024 04:41:07 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a7dc9d88650sm627436166b.152.2024.08.07.04.41.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Aug 2024 04:41:01 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 2CD175F935; Wed, 7 Aug 2024 12:41:00 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Ma?= =?utf-8?q?thieu-Daud=C3=A9?= , Thomas Huth , Beraldo Leal , Yoshinori Sato , =?utf-8?q?Alex_Benn=C3=A9e?= , Paolo Bonzini , Cleber Rosa , Gustavo Romero Subject: [PATCH 3/6] configure: Fix arch detection for GDB_HAS_MTE Date: Wed, 7 Aug 2024 12:40:56 +0100 Message-Id: <20240807114059.2339021-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240807114059.2339021-1-alex.bennee@linaro.org> References: <20240807114059.2339021-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::136; envelope-from=alex.bennee@linaro.org; helo=mail-lf1-x136.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Gustavo Romero GDB_HAS_MTE must only be set if GDB supports the aarch64 arch, so the test if "aarch64" string is present must be against GDB-related '$gdb_arches' variable and not against '$arch' variable. Signed-off-by: Gustavo Romero Message-Id: <20240804161850.2646299-2-gustavo.romero@linaro.org> Signed-off-by: Alex Bennée --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 019fcbd0ef..a3aa257fd3 100755 --- a/configure +++ b/configure @@ -1673,7 +1673,7 @@ for target in $target_list; do echo "GDB=$gdb_bin" >> $config_target_mak fi - if test "${arch}" = "aarch64" && version_ge ${gdb_version##* } 15.0; then + if test "${gdb_arches#*aarch64}" != "$gdb_arches" && version_ge ${gdb_version##* } 15.0; then echo "GDB_HAS_MTE=y" >> $config_target_mak fi From patchwork Wed Aug 7 11:40:57 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: 13756169 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1B3CCC52D73 for ; Wed, 7 Aug 2024 11:42:34 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sbf2Y-00067a-RT; Wed, 07 Aug 2024 07:41:14 -0400 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 1sbf2V-00061r-BF for qemu-devel@nongnu.org; Wed, 07 Aug 2024 07:41:11 -0400 Received: from mail-ed1-x532.google.com ([2a00:1450:4864:20::532]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sbf2S-0003Aw-2v for qemu-devel@nongnu.org; Wed, 07 Aug 2024 07:41:10 -0400 Received: by mail-ed1-x532.google.com with SMTP id 4fb4d7f45d1cf-5b3fff87e6bso2071496a12.0 for ; Wed, 07 Aug 2024 04:41:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1723030866; x=1723635666; 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=d0QPEqtA+qpDzt7i0lZe0ZnMA0wLtKuzxZzR6bJALDk=; b=iKiG3saLhsSfZosd05qJMJpe7uNecCh409uXaTPXQ08n4Vn/5BMSkz5zhJTQWah5Dc +fiomGCArdl4YlnxYzotSCCrrPyCdJJz5euHPM9BQp6c7onNAe7nYvk9OZvDx6EfmS7p upUcPmaFd3Web03O7eEjf85FLBDtX1CdxFeTK5K9+1fj4qE/1IJ0/JPCne5rOM535NIG gm6QqctFXp3YRlORbJrhBJ5NzJPgNiqnNAvvVWi9eRJ9CRUNZ0n+IHcYFOafc6POYLd5 nC5oGzIJMGvLrlMZBAUdN6jcVRnC1oEKpVehoAfATP1xeWhUKjoSy6SXv2CollbeS7Mn //Vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723030866; x=1723635666; 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=d0QPEqtA+qpDzt7i0lZe0ZnMA0wLtKuzxZzR6bJALDk=; b=XkPTHYbNADWDLyA2Ug7jJ98wH6+hvjdlxsnBrgl9s7WHNr8BvqGw4pN+Ull1HECJWl uJ5B6uR4v6OViP9domEMyMzuqTZ/uYAAEmEEtfApPdACuY+w2tcI0KXOqKh0c+E8K8Mw hdxx46ly4ZP1f9SoBE5oeQuONomU9dgXuLP1NQNowQwSTBuACyG0JSd27hvRh4rSnpFG UnuARQJIbe8PjDWg7uYVRUaqaxl+JPwSbgZ7tARY+5cLH0iW1u3kOvdizr97BGtG4fRW wbZpcbakHuvcsXmoEwI5XK9d4S3Yd4yT0QCyRi/j6x2+nNFiSjxTXpIaz10hAmOhXFIO WfMg== X-Gm-Message-State: AOJu0Yw/qQZ9KAZIusGe3yAoyMO8k9tOOrMmueFaxZMwF5CfK9J1JEOm rYvrJCfEuUxvI17ZjjEAY8qDlVTnx9KrxilH+WiJqIRdsoSvQ8fsfGGCRiu8XCo= X-Google-Smtp-Source: AGHT+IGXfhMo4WKM08xR1ijUVkUY2acH2LQ5WRnPWtiEulanBGCcoTaNxAzcAmHrg4vPybmMDq4HJQ== X-Received: by 2002:a05:6402:1a3c:b0:5a3:5ac1:ed57 with SMTP id 4fb4d7f45d1cf-5b7f36f5898mr14248901a12.5.1723030866202; Wed, 07 Aug 2024 04:41:06 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5b83bf3ad38sm6969960a12.84.2024.08.07.04.41.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Aug 2024 04:41:01 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 430ED5F950; Wed, 7 Aug 2024 12:41:00 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Ma?= =?utf-8?q?thieu-Daud=C3=A9?= , Thomas Huth , Beraldo Leal , Yoshinori Sato , =?utf-8?q?Alex_Benn=C3=A9e?= , Paolo Bonzini , Cleber Rosa , Gustavo Romero Subject: [PATCH 4/6] configure: Avoid use of param. expansion when using gdb_version Date: Wed, 7 Aug 2024 12:40:57 +0100 Message-Id: <20240807114059.2339021-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240807114059.2339021-1-alex.bennee@linaro.org> References: <20240807114059.2339021-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::532; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x532.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Gustavo Romero $gdb_version is now used in more than one conditional case and its usage in such cases may increase in the future. Therefore, avoid using shell parameter expansion when using it by setting gdb_version to its final form. Signed-off-by: Gustavo Romero Message-Id: <20240804161850.2646299-3-gustavo.romero@linaro.org> Signed-off-by: Alex Bennée --- configure | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/configure b/configure index a3aa257fd3..97de85d710 100755 --- a/configure +++ b/configure @@ -1103,8 +1103,10 @@ fi # gdb test if test -n "$gdb_bin"; then - gdb_version=$($gdb_bin --version | head -n 1) - if version_ge ${gdb_version##* } 9.1; then + gdb_version_string=$($gdb_bin --version | head -n 1) + # Extract last field in the version string + gdb_version=${gdb_version_string##* } + if version_ge $gdb_version 9.1; then gdb_arches=$($python "$source_path/scripts/probe-gdb-support.py" $gdb_bin) else gdb_bin="" @@ -1673,7 +1675,7 @@ for target in $target_list; do echo "GDB=$gdb_bin" >> $config_target_mak fi - if test "${gdb_arches#*aarch64}" != "$gdb_arches" && version_ge ${gdb_version##* } 15.0; then + if test "${gdb_arches#*aarch64}" != "$gdb_arches" && version_ge $gdb_version 15.0; then echo "GDB_HAS_MTE=y" >> $config_target_mak fi From patchwork Wed Aug 7 11:40:58 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: 13756171 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 35C68C52D6F for ; Wed, 7 Aug 2024 11:42:46 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sbf2c-0006M0-8r; Wed, 07 Aug 2024 07:41:18 -0400 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 1sbf2a-0006GA-RK for qemu-devel@nongnu.org; Wed, 07 Aug 2024 07:41:16 -0400 Received: from mail-ed1-x52c.google.com ([2a00:1450:4864:20::52c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sbf2Y-0003BZ-J1 for qemu-devel@nongnu.org; Wed, 07 Aug 2024 07:41:16 -0400 Received: by mail-ed1-x52c.google.com with SMTP id 4fb4d7f45d1cf-5afa207b8bfso1710104a12.0 for ; Wed, 07 Aug 2024 04:41:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1723030871; x=1723635671; 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=n64RF5K4puFYsrbYwUB9onFxORCL/g5Ezx86ohwcFKM=; b=UZuobJIOhVaCZbEfVgYmCD/kVMaDkZ7aeet0lYZQjiKjcll1c1pXAn1m74mx0jBM+k 5MwGDrSNJE9bchRySnm00jj+k3aNWnmbjG/hvnfarFrlHiSNrokNDbGfzWqDId4LJ5GM 3T+1JTi8apfXF3ASuw2bQkHKwSJPyWmfNmrZE9ntaiLemidYdkJPIoeEI8wB4pETPNUa 1Ub2Oda700c8/A9UakWd9mBJGFk2xGAQPrrTnhrq2fFbQNt+kdJ63OcE1qyd5jRelHqC 9cJepkd/ptLrJD8FrQaKP6dZpykDw2IW7VO/zS+HfibnmLiko47qt21wkzz1DhoB1ZQ/ Dltw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723030871; x=1723635671; 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=n64RF5K4puFYsrbYwUB9onFxORCL/g5Ezx86ohwcFKM=; b=OrD7bOiVdUdtKtxf8VyFzmouEVXrSTL9MqUgpmQuLA/1gfp0cZ/K4iKxMrZNfP8eRP ub6M3DNfTwqVDTq2Bc3jaZDkkF1zswcujlly16KKWvIuhSB1pVsZ9LR/rppY4doBRi9x f42fXWhEp8FOjHN+RvwIKY7MlinWhIGzrp4b+vmfKts0shEUw1BnA9G12NFKV6V0SH7J ssgWhhNTCroFmhcxQQzULBJJ54Ll85T/wwYXfpGjytRKB5aJ8pKtBBP1NAwtgt5y0yPJ ePsdoN/UAeoDSJyzRGn7Jb5r9DskmE6q7m/wWJX+aZfhaARVqO7E7V1bJYXCdKuIMj7A wktg== X-Gm-Message-State: AOJu0YxUpq/oUjkObIprLv2WRqmllWBXZYrfm+XYSAPqfBYMwVl0Mg1Y OaM+tz3Sm8pMy3xOFyVFJ41nXI9lzFf8nyW2fE07z4uv+B04jQgsbL016hk9zV3g+Srf8NGdDsN E X-Google-Smtp-Source: AGHT+IHcZudN3GLdiaxqOnd2fkd7/HANgrNYobruFvDZhD8PPE5+X/L9YyqwAgnST1dmsYe8UNP1Sw== X-Received: by 2002:aa7:d28d:0:b0:5a1:22d:b0ff with SMTP id 4fb4d7f45d1cf-5b7f56fbe16mr11505299a12.35.1723030870704; Wed, 07 Aug 2024 04:41:10 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5b83b92cbccsm6931570a12.68.2024.08.07.04.41.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Aug 2024 04:41:07 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 595DD5F9E9; Wed, 7 Aug 2024 12:41:00 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Ma?= =?utf-8?q?thieu-Daud=C3=A9?= , Thomas Huth , Beraldo Leal , Yoshinori Sato , =?utf-8?q?Alex_Benn=C3=A9e?= , Paolo Bonzini , Cleber Rosa , Gustavo Romero Subject: [PATCH 5/6] configure: Fix GDB version detection for GDB_HAS_MTE Date: Wed, 7 Aug 2024 12:40:58 +0100 Message-Id: <20240807114059.2339021-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240807114059.2339021-1-alex.bennee@linaro.org> References: <20240807114059.2339021-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52c; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52c.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Gustavo Romero The test gdbstub/test-mte.py requires a GDB version that supports the qIsAddressTagged packet. According to GDB NEWS [0], this packet was first made available in the GDB 15.1 release, not in 15.0, so this commit fixes it in configure. [0] https://www.sourceware.org/gdb/news/ Signed-off-by: Gustavo Romero Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2477 Message-Id: <20240804161850.2646299-4-gustavo.romero@linaro.org> Signed-off-by: Alex Bennée --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 97de85d710..d08b71f14b 100755 --- a/configure +++ b/configure @@ -1675,7 +1675,7 @@ for target in $target_list; do echo "GDB=$gdb_bin" >> $config_target_mak fi - if test "${gdb_arches#*aarch64}" != "$gdb_arches" && version_ge $gdb_version 15.0; then + if test "${gdb_arches#*aarch64}" != "$gdb_arches" && version_ge $gdb_version 15.1; then echo "GDB_HAS_MTE=y" >> $config_target_mak fi From patchwork Wed Aug 7 11:40:59 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: 13756172 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 527E8C3DA7F for ; Wed, 7 Aug 2024 11:42:58 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sbf2a-0006Fl-TM; Wed, 07 Aug 2024 07:41:17 -0400 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 1sbf2Z-0006C3-Mr for qemu-devel@nongnu.org; Wed, 07 Aug 2024 07:41:15 -0400 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sbf2W-0003BQ-Pn for qemu-devel@nongnu.org; Wed, 07 Aug 2024 07:41:15 -0400 Received: by mail-ej1-x62d.google.com with SMTP id a640c23a62f3a-a7aac70e30dso189166966b.1 for ; Wed, 07 Aug 2024 04:41:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1723030870; x=1723635670; 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=ecJtrwPM/qaJJXagybzVYA5cneRACpB/XSuc2I/vBc0=; b=V+W5F/9hVajkrA/nEMLRqzQE2kI/H/eie01kPLhyjAHuZTOedthNp81od2RA05nk6K 8QvOby55XhD/7j7PHWpXl367wtvCuqbW/BDZVwO1xAxyLAhFjxs3coYVvtEp6G83YZCr /dAdpM+V7ymJGblMOY70gDR4/fIfK2aAYD6Ua9SZoe2Y0M4NQcvRdXRfj5qaNuLLyxZt HeTdh0A2FgcUEkoS5+qH0cY57mWLL89VaaQdsBwclblojHdgLPcXA4kbuFYyIfZUbUcK 1ivMIVZHwykxhfI/wKi8TMI9tdrUNQuQpOLoDRg86CWlKKJvWf16cW8EdVYD1cUZcDdh 42aQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723030870; x=1723635670; 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=ecJtrwPM/qaJJXagybzVYA5cneRACpB/XSuc2I/vBc0=; b=l3Q5s8vhuomucYgSp626fie/fMJJqYf9h34g1xwFM1NqRd9lLSvy10AFMoCWyEUwiK Dmh+2ex23k9lP7sRHbtQPjqCUwLKeZPV1xFJ2q0cGlPuycf8e7+yWFPO1BYPFBQ9mTT2 0jXad0cN8BgBgxiOp+NM4+m6zvQMT3xSarrmgIkmXG4l4QXYgDrBELyQVLXRYvb3uriO 0ccx7g6BvGfQMeeapIMdzK8yS2BbptEDNolm1bIqmFpp3TcNhMZ1Ew65stOUCZre4C00 RkK032u11eLOSzhnirXclS0kR5X4ZX10xZA+oJkBgvaZmysxMG6EIrEWPJMrdoZKZNz9 Kpbg== X-Gm-Message-State: AOJu0YyAFHL5VQKCz4hmvdChRD7hUlkrvk6RamwDmhrULbJ1BGhYjW7c iyfJaNiLTxpCsR4xRcysTf/atUGWXJnxYPRzdKTLaPcpZz7pxOckjFKnF1e0BaY= X-Google-Smtp-Source: AGHT+IEOYt7VVIUjvhLC8vzpDPBu0VfAGQ5siInhvEP4PzoOnY2VFTTgnyQh87leEedzB/JDgqk4HQ== X-Received: by 2002:a17:907:98b:b0:a77:b01b:f949 with SMTP id a640c23a62f3a-a7dc507f325mr1308774066b.35.1723030869989; Wed, 07 Aug 2024 04:41:09 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a7dc9d4dd45sm632426266b.104.2024.08.07.04.41.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Aug 2024 04:41:06 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 6EF755FA0A; Wed, 7 Aug 2024 12:41:00 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Ma?= =?utf-8?q?thieu-Daud=C3=A9?= , Thomas Huth , Beraldo Leal , Yoshinori Sato , =?utf-8?q?Alex_Benn=C3=A9e?= , Paolo Bonzini , Cleber Rosa , Stefano Garzarella , Cornelia Huck , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= Subject: [PATCH 6/6] scripts/checkpatch: more checks on files imported from Linux Date: Wed, 7 Aug 2024 12:40:59 +0100 Message-Id: <20240807114059.2339021-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240807114059.2339021-1-alex.bennee@linaro.org> References: <20240807114059.2339021-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62d; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62d.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Stefano Garzarella If a file imported from Linux is touched, emit a warning and suggest using scripts/update-linux-headers.sh. Also check that updating imported files from Linux are not mixed with other changes, in which case emit an error. Signed-off-by: Stefano Garzarella Reviewed-by: Cornelia Huck Reviewed-by: Daniel P. Berrangé Message-Id: <20240718072050.9503-1-sgarzare@redhat.com> Signed-off-by: Alex Bennée --- scripts/checkpatch.pl | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index ff373a7083..65b6f46f90 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -1374,6 +1374,9 @@ sub process { my $in_header_lines = $file ? 0 : 1; my $in_commit_log = 0; #Scanning lines before patch my $reported_maintainer_file = 0; + my $reported_mixing_imported_file = 0; + my $in_imported_file = 0; + my $in_no_imported_file = 0; my $non_utf8_charset = 0; our @report = (); @@ -1673,6 +1676,27 @@ sub process { # ignore non-hunk lines and lines being removed next if (!$hunk_line || $line =~ /^-/); +# Check that updating imported files from Linux are not mixed with other changes + if ($realfile =~ /^(linux-headers|include\/standard-headers)\//) { + if (!$in_imported_file) { + WARN("added, moved or deleted file(s) " . + "imported from Linux, are you using " . + "scripts/update-linux-headers.sh?\n" . + $herecurr); + } + $in_imported_file = 1; + } else { + $in_no_imported_file = 1; + } + + if (!$reported_mixing_imported_file && + $in_imported_file && $in_no_imported_file) { + ERROR("headers imported from Linux should be self-" . + "contained in a patch with no other changes\n" . + $herecurr); + $reported_mixing_imported_file = 1; + } + # ignore files that are being periodically imported from Linux next if ($realfile =~ /^(linux-headers|include\/standard-headers)\//);