From patchwork Tue May 6 14:41:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 887840 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2590279wrq; Tue, 6 May 2025 07:52:45 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXAb0FzRW2fiTkzg99XA2sA5108vSHTPpffu1fxKO6InnWs9M4yVqpoWs+uQD1I+Yp1X+hpzQ==@linaro.org X-Google-Smtp-Source: AGHT+IEicC4RMpu8/f/amvdMIBOBy2e3spZGWVVTcr4prZggrsmSMcyUOewPHjFGUIBelhe53EEE X-Received: by 2002:a05:620a:244e:b0:7c5:b909:fde1 with SMTP id af79cd13be357-7cae3ab122dmr1626973885a.25.1746543165062; Tue, 06 May 2025 07:52:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746543165; cv=none; d=google.com; s=arc-20240605; b=cV2ILOa2cPGGjwWPn8S0P+enf6wvd4kGv2mivhIsxnjOB9Vkmzopm8vppC9pgvohkY Qzqx8qfFvsK7Cvk4X6rt3LvRPgiEn5lzR+z2c35Sg0P9143p2Ku7IhvOXGSuOaCt9V7x w7xbA9RUM5LUH+waM7U3+P1yMUzvpLMPGbCWpGkkYb1GpF7TLqcAzD2V7PW26pz/NJlI L1IjfZ9nt7RKLprBVtwzyizuCceS4avgZ11sDCJTILejBoo2NF1+MOScUodlBJfHILeR IxsVJ9meQhKT9cJ1MwNoibc3q65KVFVv6kB6R5s7gg5NfAEHuDlZq0uNILrhRXtA7cKr 2Iug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:to:from :dkim-signature; bh=O4yiiXtXUXViae7AovwnCxNdXlhh8r1+3qxtggxQ0u8=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=VrS4YX/JEHh2LEk++7LyAkJHzPZgskOr2kkda29KZ/6bD0fKFuKjbXVXt8wYfSKy6o Wcm7r94q6wO5Uw8jYWtveOSf7mLPQ/65CoWJotCm6l46KJkfQJ6xAa7Nf+9NZFfJfyv2 FXqFunixfzBxWka+gMTwXs6xSbiAvfFL/3JlNuAKZwb0gbv+zSDUhfo47+iAAcTKWjXU dOK9hX83+c710piWyHCuznhU+7fxP9VnJyHljLa4KsAA184rM4YBSakHbb2GA79IYjnq CctY+VkP/FAgEysQMOjTE86qez+HJlWWA4g8hOk+hZC1aYzb1iCt0IOeNqgJl2NThvCk zbAQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=eueKHSzw; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7cad23b9f5dsi1111504585a.12.2025.05.06.07.52.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:52:45 -0700 (PDT) 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=eueKHSzw; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCJXM-0002of-Hg; Tue, 06 May 2025 10:44:48 -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 1uCJUz-0001Rh-QO for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:31 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJUx-00024S-9X for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:21 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-441d1ed827cso4603305e9.1 for ; Tue, 06 May 2025 07:42:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542537; x=1747147337; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=O4yiiXtXUXViae7AovwnCxNdXlhh8r1+3qxtggxQ0u8=; b=eueKHSzwQlRyoAUoMWfineQ26z3BYfHkVsP4fqCHk2Ap8kvKtkS+J39Rj1TnHwhLjo qtG4bacSafF3pPOHBJtAUA7Ar2u3KXmNAMT51sLnyeKcLgah9pHtWQ3UNWM3eiaGyz8T XADfOo1g28qUJd5k+y77NNCPQavyJXTMONgYIWlFbNoJm1RIkREmU0mYsAG3jr+hIdMR WPj0BQjesjiAWAvqMJQvUrDk3BHQSSItvIaNeZa7zNyvl+N+N1WkAHkKybby93w7gSUI PDFe9R8N2q48tqunHIuUUuOfpqhPhQETKf5Y31ChAnYTIMEtHjf0HM+aqloKp8+FFPK+ G9HQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542537; x=1747147337; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=O4yiiXtXUXViae7AovwnCxNdXlhh8r1+3qxtggxQ0u8=; b=WtcDP9bHTqQO0klbwz5vdjFyeLUsdVqBStUARcSF1Xj0z3MFJpYx9jP6YrgnhuWk52 UhDEQMOxY/XVAM/3mK5WI3WUYz7g/gbqpl0hkJc4VyDj21lOp01XZuhy0SKpz78hf1IV i2PtN1mxBM8D29UOm+fqQjvQD/80deRtiPei6gOEuJAb8uHL6n4PWjTD4arh7kkl5JKq nRnniTud+X+SmxAXzQI6dKZ1cW4JE0d0d8UnEmQ8EmHTEG0rRV+a22PGHEcepCzregn8 v/WHMcDo9ix+cOlsP2E3q6sXqAwjxpwwPfwwCyT5e0l8eWdTLKyFM8pX9kqGBgNo5L6c z1DQ== X-Gm-Message-State: AOJu0YyLoZdLsKEXQrK0kTh+G24TmrRnSFm2wj4CPHRN9cYfu3bv/oI+ hEC45f5QHtO4+lnzPScABV2J907D2xwvuswUGyHnWUshFdcI/PNb7AsnTudJiO1fIHpiJ50k+ND g X-Gm-Gg: ASbGncuuljehzkgNTSZ27dcRGBnQ4F/C5ucJONAIlJhUqo48FT1cBJHsY/+PbIoxqXh cWUIXZihostfBRxUBr+EsRibs0QaDY+1sxeQUTSN0gXED303jl3m3/xOP8d8p0AP815B9etir1+ m4GWeiy2mR8j1OLJRvmyBQKQpKU+C2bbTZ1i5DLuCxjrcmtWsQ1OsB4dRb97EdqZdbq2vd9SF1p /iNQwiscIjOr0iYG7hMSQSp7dLkSu4pjotyPV2HkeMzbdzxvR7Ni/CpgLtgGWga5lXerIY1ZFNc sg8yiwqSdSIlKfpXMcJDai0bDHQdVNNm2NryrfYd6TmEe7M= X-Received: by 2002:a05:600d:12:b0:43d:b85:1831 with SMTP id 5b1f17b1804b1-441d0a31ec5mr33718785e9.0.1746542537471; Tue, 06 May 2025 07:42:17 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441b89edfc2sm169603435e9.20.2025.05.06.07.42.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 07:42:16 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 01/32] hw/arm/npcm8xx_boards: Correct valid_cpu_types setting of NPCM8XX SoC Date: Tue, 6 May 2025 15:41:43 +0100 Message-ID: <20250506144214.1221450-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250506144214.1221450-1-peter.maydell@linaro.org> References: <20250506144214.1221450-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x333.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Tim Lee NPCM8XX SoC is the successor of the NPCM7XX. It features quad-core Cortex-A35 (Armv8, 64-bit) CPUs and some additional peripherals. Correct the `valid_cpu_types` setting to match the NPCM8XX SoC. Cc: qemu-stable@nongnu.org Fixes: 7e70eb3cad7c83 ("hw/arm: Add NPCM845 Evaluation board") Signed-off-by: Tim Lee Message-id: 20250428022934.3081139-1-timlee660101@gmail.com Reviewed-by: Peter Maydell Reviewed-by: Tyrone Ting Signed-off-by: Peter Maydell --- hw/arm/npcm8xx_boards.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/arm/npcm8xx_boards.c b/hw/arm/npcm8xx_boards.c index 9d9f6d0c9a6..3bf3e1f8f16 100644 --- a/hw/arm/npcm8xx_boards.c +++ b/hw/arm/npcm8xx_boards.c @@ -213,7 +213,7 @@ static void npcm8xx_machine_class_init(ObjectClass *oc, const void *data) { MachineClass *mc = MACHINE_CLASS(oc); static const char * const valid_cpu_types[] = { - ARM_CPU_TYPE_NAME("cortex-a9"), + ARM_CPU_TYPE_NAME("cortex-a35"), NULL }; From patchwork Tue May 6 14:41:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 887835 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2589726wrq; Tue, 6 May 2025 07:51:34 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWU/6KTbEZVx/b/RrZzT6spD/8EptAUSG/NpvQckM2p5XzXntn5TgQRf5DdH6oDkEquyZzTcw==@linaro.org X-Google-Smtp-Source: AGHT+IGJI6WYHAT7bA9Y5WQUvaoGBR6njdgZP540NdbHCs7DtqSFQDY1iUvVVgHxhX8u4z8SvchU X-Received: by 2002:a0c:d845:0:b0:6f5:3cae:9205 with SMTP id 6a1803df08f44-6f53cae94dfmr21368906d6.39.1746543093900; Tue, 06 May 2025 07:51:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746543093; cv=none; d=google.com; s=arc-20240605; b=N6ahcgCx2OHMN8/Bby9WPyBHyc/4lSZvIBOezTrqYHJj9c1ZgL51BKlFhz/e26hSkz Tc3nPAb8TrL3vn46cjaOAml5Oywmfq9fIGq05Z/le8CmeSHh5sw3T7tRndc8H+BW+0Ue SljY9L1TxKsY+ge1oMG468763R3/yxawTD7AH80KqZ1AZLFSuYUuevD2mdw/XLV0iymd uRU/gfQ2zEE5mcM84dS6XX11tIBD3ucCMxonE/MMi38yEnvs2cA0cWFzj2Jsa2SQujP3 JqyXMRd6FpdpKWHIDS3kd+jhlsQxM217mSF05qMGq03O6DUgvPRAp5Ye6perYQVVsGNu GENA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:to:from :dkim-signature; bh=PaHqhFsD9PqNlrmLgTeqd/y23SukxVysfdMiiupcidk=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=PVNa5w3OLiaMVtf1W6OnS0fAvhvPI/m538tg1bhOW5vnNXm4TZl27T2SchDt6GGx6b vj4q46yiQUE8jdgAwQ5jxKCq3CEftnnupC9fkbIO47NRqQhgVz+QWPySNEh4/0HNd6wO dvXe6dHqHOTFX/0sZVgn2Y6QH3Ho29+xaQ6m92Mrd9i5IeECt3+1uJ/wZYa4rw3rePE+ JZD2/xlgAeT8iQrikXrhCOWvGEE3/575lVai0ASqn1XaiT8KbBwUfiTGYEw/pjN1CQKJ vqiMcJ11UjJMadaBuS8XUdKQmCexHpC5r/PLckhFox7oFqilgur0R6OTEJSjFRS4ClQz TibA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="aUp/X89G"; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f53d215097si10978226d6.252.2025.05.06.07.51.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:51:33 -0700 (PDT) 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="aUp/X89G"; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCJYI-0006X4-7K; Tue, 06 May 2025 10:45:46 -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 1uCJV0-0001Rs-Ue for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:31 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJUy-00024y-ON for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:22 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-441d1ed82faso5311655e9.0 for ; Tue, 06 May 2025 07:42:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542539; x=1747147339; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=PaHqhFsD9PqNlrmLgTeqd/y23SukxVysfdMiiupcidk=; b=aUp/X89GLq/ekMhCovbC12ibpezIPDWrbydXCe3UZmQNhQxtIE76DxQXDufLpDpk/F +PvX8VOjIvC6Yh2kzSZSbgQIKvRXOEq6VTCEw0mx9R8eQg+ssX3N/xlQsq2XvFSU+tAs Cum6ECqugocWx9r97KM05kS7U5MThY3zLC3YlJvnuumikC06AjEFxspeIrXGK5tgM9T5 5UOGz4Io1qH9UqiwYvGAr7p5T/2TS+nRqcaaMBKKn8wEG3dlBRXtn2sreE2Qc6MeGpqC 9sluk6cTfLOGIQSJA5Glm7BvR3whO8NU2o1z3HAq1U1LRKLRNnj58Xt+O+k75C/NZ4wp GTOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542539; x=1747147339; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PaHqhFsD9PqNlrmLgTeqd/y23SukxVysfdMiiupcidk=; b=j8K9TGArMgfbON7ouJoJp/KmFk7FnOzvfJR0+K2o3K8EiZQ47tx8eskYrlFMx5o6CJ kC4XS/5gcwUh/NN61MjhsVrFBXHL9bh0HGQM1Zo6MRHM+KWwede88PfZeOSl5Nyd7wQK 0LgyK7E8geZ2hYAiRJkUA5fVshpLXfBNrfZpsMOaXMJJFDqAZtXu+tb/Qsh4ZRkkFb1N dYIXXV+crce66+bIbr7huLRoxbfmxO4L9/f1O/7P2N0aWe1op27DCtuakqjuaPzLt2ju 2ieggClRp8pluWTsBMRFGI4jNZTZ7/cgNrJeaGn6O4/WNCNGOyIafiHm9/6mWmq9kXNE dzBw== X-Gm-Message-State: AOJu0Yx71cjRe8arVjFVlu3rbDfniimiG2NkgEw7dsXz5bhj92qIne26 VrVbthg6lQ46dp+74mW5emhyKurbX94SfBcQgy2KEUic/+xBFPyz6cVq7M6f+Vmh09TzFKhGorA p X-Gm-Gg: ASbGnctDvWZ+tRiJIjGkVffNDaIDSSTkxdQBBWKU1mX6szBtXWwCYf18SIvA+aR6IEq xqZB5oCR0gPYJU36WTDto0TI0uGEWpiAPIB/PFLr+IvLeW12SgYZW/giC8Vvb47sKwAJK5ijrWw 9X2dg7lZl9MnU9yTTZNYKK2sfhLdUMPDOHRU3C1bSMny+Oyp98KHJ2pEWza/Gbqy1KEoZmM+k2r mlsdzjDoFzj/Jp0liL+Ja3VMoQUbo0k2bkYQOgZkZugJOQnP7lHWWk/Dx7GwiYLC/6UaTs4ReNy XIjAxXMRCR3Hu5CYZvsbMiuHtFxTwF9iE6RdDB1yQCk6Iyo= X-Received: by 2002:a05:600c:5117:b0:43d:fa5d:9315 with SMTP id 5b1f17b1804b1-441c4947339mr87878735e9.33.1746542538761; Tue, 06 May 2025 07:42:18 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441b89edfc2sm169603435e9.20.2025.05.06.07.42.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 07:42:17 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 02/32] hvf: avoid repeatedly setting trap debug for each cpu Date: Tue, 6 May 2025 15:41:44 +0100 Message-ID: <20250506144214.1221450-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250506144214.1221450-1-peter.maydell@linaro.org> References: <20250506144214.1221450-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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: Mads Ynddal hvf_arch_set_traps is already called from a context of a specific CPUState, so we don't need to do a nested CPU_FOREACH. It also results in an error from hv_vcpu_set_sys_reg, as it may only be called from the thread owning the vCPU. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2895 Tested-by: Daniel Gomez Signed-off-by: Mads Ynddal Reported-by: Daniel Gomez Reviewed-by: Alex Bennée Message-id: 20250402135229.28143-2-mads@ynddal.dk Signed-off-by: Peter Maydell --- target/arm/hvf/hvf.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index 34ca36fab55..42258cc2d88 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -2278,28 +2278,23 @@ static inline bool hvf_arm_hw_debug_active(CPUState *cpu) return ((cur_hw_wps > 0) || (cur_hw_bps > 0)); } -static void hvf_arch_set_traps(void) +static void hvf_arch_set_traps(CPUState *cpu) { - CPUState *cpu; bool should_enable_traps = false; hv_return_t r = HV_SUCCESS; /* Check whether guest debugging is enabled for at least one vCPU; if it * is, enable exiting the guest on all vCPUs */ - CPU_FOREACH(cpu) { - should_enable_traps |= cpu->accel->guest_debug_enabled; - } - CPU_FOREACH(cpu) { - /* Set whether debug exceptions exit the guest */ - r = hv_vcpu_set_trap_debug_exceptions(cpu->accel->fd, - should_enable_traps); - assert_hvf_ok(r); + should_enable_traps |= cpu->accel->guest_debug_enabled; + /* Set whether debug exceptions exit the guest */ + r = hv_vcpu_set_trap_debug_exceptions(cpu->accel->fd, + should_enable_traps); + assert_hvf_ok(r); - /* Set whether accesses to debug registers exit the guest */ - r = hv_vcpu_set_trap_debug_reg_accesses(cpu->accel->fd, - should_enable_traps); - assert_hvf_ok(r); - } + /* Set whether accesses to debug registers exit the guest */ + r = hv_vcpu_set_trap_debug_reg_accesses(cpu->accel->fd, + should_enable_traps); + assert_hvf_ok(r); } void hvf_arch_update_guest_debug(CPUState *cpu) @@ -2340,7 +2335,7 @@ void hvf_arch_update_guest_debug(CPUState *cpu) deposit64(env->cp15.mdscr_el1, MDSCR_EL1_MDE_SHIFT, 1, 0); } - hvf_arch_set_traps(); + hvf_arch_set_traps(cpu); } bool hvf_arch_supports_guest_debug(void) From patchwork Tue May 6 14:41:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 887823 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2588665wrq; Tue, 6 May 2025 07:49:09 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCULN6NQAU3zpRomBs0EpkrOJRSzl38TP75/LNzdrZzdsH8CFPM1YQO0fKk20dNTpfJCwD8MvQ==@linaro.org X-Google-Smtp-Source: AGHT+IE9lV8DIosI8B12gVswAnI957Fg5dI+ubLWyWN36Y96/CIIVeYbxiYYJ25wFg3pOVYISwUO X-Received: by 2002:a05:622a:156:b0:478:f747:1b7d with SMTP id d75a77b69052e-48dff3e0b0bmr177557591cf.6.1746542948885; Tue, 06 May 2025 07:49:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746542948; cv=none; d=google.com; s=arc-20240605; b=XxZR9QGVutHujnor08AsYVsCtt2y0aSWVJZRLwQebXx/GJOT5Yw2rMQNRbzgsxbC2F mYFCJfTryUCGCIP8ri1MjRuD1xVHm2fIwn3bgPiS7FxAuo/sT7zd+5tcFaRuabFDdUIR XnsGue38mMYyVgsDFFctJWzkPBFffhElbbIsvUBHsGawcOrpCiVCWwD8K1gK0s5OdnZN lxx6Z1+b4UmhX27Sm9zlNRCeS9kEKNn98X2xZy/BClHK69Y8L7cfumO7i7+eN4a3UyOz mDpK62ahaVGm+yTi4eY6boECdGqvg5DdtsdP+cwj0q21/R8I0ybLxyRnsM3ZdMgDRtm4 +rSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:to:from :dkim-signature; bh=laNSgZ2YaiiHIrfl+xZU7dbvVIxq1VzisjPBXcfl60o=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=S4b2tqX2D1yR7SkYVoHZbiMY5qVN3u6b9CE8XoPiRtV+aDGfTb11ckjIqnIlzJp3Ta 3AN+2hKY97lQHE0RKIadUM3qDh957776olQOUDeSzxMp+360oM7QtU1sBLULqlPur0lG EMWRz4sHsMuFMA8tF739HLfudWNfLwL602ttX4Un01pxIyuHC4sylyI7vO2aUsleGITP jzHP42zQ09mlCJR9Gk8CK89lqzKoW40P4orQ3nQzUe6d8keWfEqcTKCyBW17c7yxFmsS MWCnqSj+mHkMuzNcZz6NCu0HohLpAyQP023ViZ8ceq7kaKoHy5eH7k3uFtQEUxXyJVfR JbxQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qf5jvsgB; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-48b960d00casi114196231cf.104.2025.05.06.07.49.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:49:08 -0700 (PDT) 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=qf5jvsgB; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCJXQ-0003M5-T1; Tue, 06 May 2025 10:44:53 -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 1uCJV3-0001SJ-RT for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:31 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJUz-00025D-Iy for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:22 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-43d0359b1fcso36186925e9.0 for ; Tue, 06 May 2025 07:42:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542540; x=1747147340; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=laNSgZ2YaiiHIrfl+xZU7dbvVIxq1VzisjPBXcfl60o=; b=qf5jvsgBODS2lvieRoyzoG/TT5lQFacReP94OrBkQHI4X6zawTk395Ym72Z4/ZK4dx Zxs4idqMCy/eFzfkzKhqqABRGrF4HgSoyDSzzCGURa5HxMFGx16c5MJ1bguwSOOh7ePt JUQCXLlHQ4LCu87EXWrr5oNzSb26Sdmcs9nPbOACG+OnaF6I05AnKrF+pvo74yWHcYJ0 xU3JZbq45uKJWXJZO/j4Kl6WwGUG8/bLQCdxAbKXew3xB1XuY72r4yQ1fNroC2M8CfyY nMkEUP6tYnW03S/XeGw76iuJ2VqaerLdLp/Jx5hPQxx0ecGb+vJ883ldwRy17gUeerzc DkNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542540; x=1747147340; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=laNSgZ2YaiiHIrfl+xZU7dbvVIxq1VzisjPBXcfl60o=; b=GiXOix8TwFwcVAHvsrwppesAWp4s0amXWSLxRBGNY/aDu4W+bcqyQb0FjInWUIiZNl fzOaNZSN8zocnXBiPRye0dgbVKuCxQzZTC8ktOrYHEpKMDoHHD4W4LxGvs+mqEJKMZP2 XmlClX7lksvA24I9NydAS9Sj4tjuoyEFGfjGhS8E/0dXdE2XsnUmBC4GCvzizQUZhVlw Ax0zyCqS/QmiqIZWRDFf4aMoyyB3kJ7Lydqrx/2L76Vqzb8hXORz9cP3AVS6qvc4sEUt /lCMqrNEk1DTQH1dQDcRv0pRkeK15E+6GnsLGEKUdBFajH7YMWO337J0vJ8nrUriNRA3 KIjw== X-Gm-Message-State: AOJu0Yzus/ilVkwVQGiW+zjxVJQYCILrRAO/rDlI1acWFvVxC4SlKCYv 9XrJz/2qnMKbL/T1YDNG4ygqDuveFxdXmrfP6UXtZxaTVrjxG0qvHsFymS/zrgm/8WbFTE3P2jh o X-Gm-Gg: ASbGncvUDdFi48FbNSQEy+WyvjY3YmJKeTw0rVnNEJvyZW0vGkrePHwGld0vskSx0fX gIcbDMInttL3yg1zWhHNxCQWmgbhClUOsc7bnco80C9qZnF3tF/I7E7TaHdx6NLav0RKfTLUtn6 h5zmK0c/Dun7p9zk32Bk3R4wXfVKiB7DEV9tQvQErPTJM7GCZC+xAYQ+5WZHRhmqQhlZeACdECL lIOUUeP++qRqT9wdXgubYXPNWUBrODHnCR5Gwo7pJVV4YjnCHKQos8fw86AZAh3Te0JmLTjCjHI EsLePJWDYBFMJSiQ6jf0OymeHPEFsiPc48mknv5dT4wA8HQ= X-Received: by 2002:a05:600c:5487:b0:439:4c1e:d810 with SMTP id 5b1f17b1804b1-441d3a56bc7mr274155e9.9.1746542539779; Tue, 06 May 2025 07:42:19 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441b89edfc2sm169603435e9.20.2025.05.06.07.42.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 07:42:19 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 03/32] hvf: only update sysreg from owning thread Date: Tue, 6 May 2025 15:41:45 +0100 Message-ID: <20250506144214.1221450-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250506144214.1221450-1-peter.maydell@linaro.org> References: <20250506144214.1221450-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x329.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Mads Ynddal hv_vcpu_set_sys_reg should only be called from the owning thread of the vCPU, so to avoid crashes, the call to hvf_update_guest_debug is dispatched to the individual threads. Tested-by: Daniel Gomez Signed-off-by: Mads Ynddal Reviewed-by: Alex Bennée Message-id: 20250402135229.28143-3-mads@ynddal.dk Signed-off-by: Peter Maydell --- accel/hvf/hvf-all.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/accel/hvf/hvf-all.c b/accel/hvf/hvf-all.c index d404e01adef..3fc65d6b231 100644 --- a/accel/hvf/hvf-all.c +++ b/accel/hvf/hvf-all.c @@ -58,8 +58,13 @@ int hvf_sw_breakpoints_active(CPUState *cpu) return !QTAILQ_EMPTY(&hvf_state->hvf_sw_breakpoints); } -int hvf_update_guest_debug(CPUState *cpu) +static void do_hvf_update_guest_debug(CPUState *cpu, run_on_cpu_data arg) { hvf_arch_update_guest_debug(cpu); +} + +int hvf_update_guest_debug(CPUState *cpu) +{ + run_on_cpu(cpu, do_hvf_update_guest_debug, RUN_ON_CPU_NULL); return 0; } From patchwork Tue May 6 14:41:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 887843 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2590775wrq; Tue, 6 May 2025 07:54:00 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXFnJKl4cVZc9xuc6ugoCELsoHAAir2VPTEfG7Q1o3rl1+4Tu8s6a83/M3qgpAZ0dsy8eIWqg==@linaro.org X-Google-Smtp-Source: AGHT+IHKNfFrSGhOG3FlphGrikj0+BDDG9jypfi+0VVnOfYmNb8VOTCiSxd4wz+EeeWm55e/CJ1j X-Received: by 2002:a05:622a:14e:b0:476:9e28:ce49 with SMTP id d75a77b69052e-490f31687c8mr57386551cf.43.1746543240043; Tue, 06 May 2025 07:54:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746543240; cv=none; d=google.com; s=arc-20240605; b=D7lpf/l05p70e8HqPFnQ6qADdOvlhCISLfJqS3X+C9P7DwppRCpLNJcyME8aWgTPFO zbLxsvmSupzsS2q2Kj/Wk65fIg6UTKDIpByc8e3bsmTwME5XaE7WpI023VHXzjPyzfBv obhfu28cBqJpeJE+xM6DpYPhKXqgPFW5aDXRaGzArkwWDkA4nm3BXjMRNBtAszrmqYjR 0hbDnarKiALifBIE85za4pGNWrnP1pLXluwXBZfeWJoFC6+gKuPwAv1h8Zd4l7tkfJi8 8ki8E7mPhTSIADqm/czDC5TDfWEEIjmtbIAeVNCYZWOnsjHGPLiEVmjCP1xgMy5aNNpR oZRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:to:from :dkim-signature; bh=VckgnWFHcXJaFRW3+b8g4WIpqvkRRSf9OGC46J//Dr8=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=fC2jHBKYRTTEkxoTmwp/d2cTCTjTywdh1MWSbq8eZlTUL60/XT51OKvUSK4XUDACkt hsojPRjAd/EJGFen9ctglCP5qQ5l89iy6tL4QQE0fZYgN2Ewy2olItC2dmI7natklhbL l0GTiX4TD0a9kDDEi59Q2NaiX5QJaKISzFlQLsfnRo7b4QhsjhyTqeNkqwC4BAueCpJE In6rwUfpS6QEohHCNUOf9arf2MiRHQNBTMwdwQhb4O7f3aeP6uElZwRv58V4ih/WPz6p 6r9Hr+aYkYAMd0ZTdEKYepZWlc959DvyIL57axcqBhebWHfMTeS1Gw4Ww5vQ0P0Kfum3 uxzQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Zyi5WTfn; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-48b98e09dbcsi111912721cf.587.2025.05.06.07.53.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:54:00 -0700 (PDT) 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=Zyi5WTfn; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCJXX-0003p1-38; Tue, 06 May 2025 10:44:59 -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 1uCJV5-0001Sc-AG for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:32 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJV2-00025h-LV for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:26 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-43cfba466b2so48970045e9.3 for ; Tue, 06 May 2025 07:42:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542541; x=1747147341; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=VckgnWFHcXJaFRW3+b8g4WIpqvkRRSf9OGC46J//Dr8=; b=Zyi5WTfniajaBpCXH/FETnfGyDigmWcwN786Yoo8tPMiQbajeRJUjPwH7he9hQt5/A MFFAf05hh9+vLcKisnLOXf/9GiXyfJDYYx6MJbHJNSaX6zhZ2hwBc5In3otCR0/A+QR9 LFDuzK3HuaVK8voaph/tXvChPbhoYFltb7bmPO1Sik2hMeJb8M99rxUyS1FX/zeYCwbZ nv2hMNuR1x+fh5492B5Y0NIkQiZzS1n+9YbhRKRiCylvAshzbiZW7UQwMOzZ7YFqSXaN OHthF+Wl2nRZ44n6mbOgHx6RDXA3t7dUt2h4+CbBWd0m6KJCybab8MBFBop1g6PWVlLn GW3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542541; x=1747147341; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VckgnWFHcXJaFRW3+b8g4WIpqvkRRSf9OGC46J//Dr8=; b=qjzWZsKkF9lO0K/oeOOQZPJLtifEccNu7UQEdZopxjdS9Vi4cPRnu/7H9Z3mPOHDiV FPP5bB+jljID1U7dz64nEtBz6dwokhaf98dWSbRSsptK8Ex4PQFohNlhaGBIpI4wsX42 nDQCeRyJOVFeDo+TJYX2WUJNZ258PPn7XemsqcsTAbZ9OpLOda2Qamv2ACfML+JOhbsW NLY5c0rDOGQfTQHKJHpg+WTGZxJQl6DhZeD7TA5yE8QpQOH045Kw94xlBzfcoqvNrrz5 OX49CRRc0ASzJJ0B0D8LLpcmmGQVGrnN0JG6u5vkEBXJu+JuVtxSCr4vIZDOhV/C/1av 4cuA== X-Gm-Message-State: AOJu0YyfQFsVv4+DYhCm6TG902UgL9zfSbnOlIm14ZI3MdQ0SdOLIMob qpBoI80RVDiKIctNLM5BQfsqmpiKNY1mef5ERY4Q7v9px4Wqk8w7JUvdyUaRbCvLh2xBB4/+BDz 0 X-Gm-Gg: ASbGncvFYzJBeMZEVO2PW1IwstAlOT0wFKEElv8kdjiEooKE3BnKIBjNfQ8sQ+u/Tpz tgV2TDsS+zZ9JjCDjD7+Y97KaMXgAO1vb47Ax3Su7XJGmuTduswZ/opArdasiCbqSfH5DJ8kPuT IkqxwAgR/06gJzchygtz0PgFqwZT+dB2NB0MltgIa5VcAnrmmACIk+R7B5Bb3f/USh76J1K1/Sf kT413RbYN1WcxmYar5bbOPmW7vGBiS/IZLh6TuyFUXZ+udFxpUw1jmW5aOp/PBVNrq5sdHmlSt/ D7PAP4QPYVikYvjJIzc1EVttz2CB9k85uJqmblnoOw5qfI4= X-Received: by 2002:a05:600c:4690:b0:43d:762:e0c4 with SMTP id 5b1f17b1804b1-441d054c744mr33025205e9.27.1746542541347; Tue, 06 May 2025 07:42:21 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441b89edfc2sm169603435e9.20.2025.05.06.07.42.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 07:42:20 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 04/32] target/arm/ptw: extract arm_mmu_idx_to_security_space Date: Tue, 6 May 2025 15:41:46 +0100 Message-ID: <20250506144214.1221450-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250506144214.1221450-1-peter.maydell@linaro.org> References: <20250506144214.1221450-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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: Pierrick Bouvier We'll reuse this function later. Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Message-id: 20250414153027.1486719-2-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/ptw.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index e0e82ae507f..bdb4de7c047 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -3551,13 +3551,9 @@ bool get_phys_addr_with_space_nogpc(CPUARMState *env, vaddr address, memop, result, fi); } -bool get_phys_addr(CPUARMState *env, vaddr address, - MMUAccessType access_type, MemOp memop, ARMMMUIdx mmu_idx, - GetPhysAddrResult *result, ARMMMUFaultInfo *fi) +static ARMSecuritySpace +arm_mmu_idx_to_security_space(CPUARMState *env, ARMMMUIdx mmu_idx) { - S1Translate ptw = { - .in_mmu_idx = mmu_idx, - }; ARMSecuritySpace ss; switch (mmu_idx) { @@ -3618,7 +3614,18 @@ bool get_phys_addr(CPUARMState *env, vaddr address, g_assert_not_reached(); } - ptw.in_space = ss; + return ss; +} + +bool get_phys_addr(CPUARMState *env, vaddr address, + MMUAccessType access_type, MemOp memop, ARMMMUIdx mmu_idx, + GetPhysAddrResult *result, ARMMMUFaultInfo *fi) +{ + S1Translate ptw = { + .in_mmu_idx = mmu_idx, + .in_space = arm_mmu_idx_to_security_space(env, mmu_idx), + }; + return get_phys_addr_gpc(env, &ptw, address, access_type, memop, result, fi); } From patchwork Tue May 6 14:41:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 887831 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2589071wrq; Tue, 6 May 2025 07:50:04 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXbFtX0nzP4yxbbXKMaPbz/+ogSS7zUvj+ZrWd+qK80G53ebjeggl4fzSpnYsEwBZf9sRXI3g==@linaro.org X-Google-Smtp-Source: AGHT+IEzLzvyxNYen4mnDYer0VQNvqw/oyD2hUNiCHzLcHSaJtodT2r0otauPuajV0EFrEbJpdZ3 X-Received: by 2002:ad4:574c:0:b0:6e8:fe16:4d45 with SMTP id 6a1803df08f44-6f5358ee4ddmr49478076d6.41.1746543003866; Tue, 06 May 2025 07:50:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746543003; cv=none; d=google.com; s=arc-20240605; b=hEuaSDmwJa3CTfClMOaAfvqe1TKLKXzWyt0l6ZP2gf3fHNFiFC6RIHWkm+nl7Nu8mg /OO9Y4YsZb2U43oioiK/tqi+9/DDl9TdRZuj3hTMLFpxijHTwDzYPewyT+NigazJ+Qx+ 0SWwROqX/Jt5aNYNBsoFios1oJ5ORoNMJwIy0SKbvDh5u2AaLFEFOpd7jqFgOvZgGhlv TtapwUtimASO2BVr4CafT0DmUh/t+9mI9nn132EUxsAEi1YvIRnS/o6c8EySPa5J2IHU ZE642u1+D7PcthAQpCxmmEm2wxI0+zaBqOuZxOkWummj+Mk1JjJHcbgPHma+vTlD/d/v FysA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:to:from :dkim-signature; bh=iaRot8lpjeibNl8vHrlolFRTMgPm1jY7hWkc0lrumMQ=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=RpoGL0FOkFmel0TiCgZIS762zV4qYIzL4VbwY8hVk0QbgrHaTGzjjKWuZlkKjYFTB5 aHOMA6hlXcs8wuaeAkFRnrDV62iWyUu89yyH9pbOg1b57UyIriQeg1olZFvbbBIFn7MD 8XZp+k7pR1Nf0C54BzibDx7VLf4CbdtGZvgDTeyMcp0V1Hhpz5DgemZ2Nn+0JW2ungjc gRu9J08PrBMADNMIwQN4nihBAa+aDWyUOzV4jVzfp9OxPEKbd1foVrCVZ+68biZ0lrts mMhHf4UVFcUWGL+8ruUVM609H9lkagYmCOr0BBOU0erFWLXpCcdkLzuJsM0Tm+Zk4xCY pcnA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qULwgcRE; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f53aae1d1esi13853296d6.30.2025.05.06.07.50.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:50:03 -0700 (PDT) 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=qULwgcRE; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCJYP-000783-TM; Tue, 06 May 2025 10:45:54 -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 1uCJV6-0001TN-O5 for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:33 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJV3-00025t-Ju for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:28 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-441d1ed827cso4604195e9.1 for ; Tue, 06 May 2025 07:42:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542542; x=1747147342; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=iaRot8lpjeibNl8vHrlolFRTMgPm1jY7hWkc0lrumMQ=; b=qULwgcREOxy83GJwNuuLvA5YzlCPFyIzGcWe9pXKHZ/Js4+y0274sVv+5bG8cE79pk 92cfTPrEx5VJ9P6Mf9T3tz0Zm0Imw/NgAM08+/I0bWfRn0DjWMBfoJsVY218LfLILeYs kiIB1P+DTCJIYji4puxlZIl8j6I7D5PJhARETOtL2BFWhMPFHzXR3KmCH0amUaFEhZ0m jwXRREBE6/zQFFT1qFwtqo8oZR69jgDMMzNIwseVVvrGa72eI7MqOye4MXAes8lVgBU+ uQId3D2Vnht5jgsWctqcJ1SAWJ+U9Bb6vVq2s/HjRwPLDkIo1BZedhlPNGtC8CPuXXAw Wysw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542542; x=1747147342; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iaRot8lpjeibNl8vHrlolFRTMgPm1jY7hWkc0lrumMQ=; b=B7SsX/PR8MhVQaRgba4u6gMhheiRNpIb+EZBL2mmJKgLMmSLfMN02u5SCJtotrw/qj pcZnTTXv/xq+fBNYeS1PcI1VX9fZJs8ATCH0PEtjbD0aK69INDYZUlOfhwG6hsyGyvQe ylBubMcyXneuJu52w/8b0aCaml2Yf2CVH7JkyqYpYncTlwEmOy2IcC48KzGRNcoioXaX 1R2JH/renLFXeHVBUzhMdANOWQZfEOhnE7ezdGU1BDQ2ZakWY3sV2g0VHJG0vg5Rdxns Zyunw2mYaoH5aiS1yOCfkjazP6RitQptssj7NcJ10DDZnRL74mGTR2Z+Nthx85zoX+9W Uh6Q== X-Gm-Message-State: AOJu0YyM5b2F8sJEICK44CmPYs2MUWM23Fi/syTAYeguS6zDqBvs77Vo PHZErrfsFzowXKkTRnS65zIEABrCw/JktxZ11VoY5Z7uX5T0JAzYlI3hJx4/P67rV5OhQA9OquU T X-Gm-Gg: ASbGncuMVPMmgPhu77YQ3KQwJJUELb6WvqaQmZi9MU+I0Iq68DbV6qnf6RYjmeOwvRf lSOXN7v62qMDHjD2bSb3mW8rH3MWcE534uJhesDvq0wh9+wIhxY18l8vXXxrmt/kzPOE61dFBpe duPI8k+NgxvvqU6rtPeiWGblijfj7s1TXhF32XA8szQ02E1lmtCOQKiVZdKtvz3VTZr0YPMlWQ/ HWdXeNCaye6erhluqWirMpU1BtpfGroIG0POcvXqulJVQF3XxWddt3q6y+u3KK07OEQW+RjEIcR DUi5xBQz3oHgMTVO55XtYRCC47nF4T56hshG8tiFCWb88CA= X-Received: by 2002:a05:600c:4ecf:b0:440:6a5f:c308 with SMTP id 5b1f17b1804b1-441d051b271mr36444815e9.13.1746542542151; Tue, 06 May 2025 07:42:22 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441b89edfc2sm169603435e9.20.2025.05.06.07.42.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 07:42:21 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 05/32] target/arm/ptw: get current security_space for current mmu_idx Date: Tue, 6 May 2025 15:41:47 +0100 Message-ID: <20250506144214.1221450-6-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250506144214.1221450-1-peter.maydell@linaro.org> References: <20250506144214.1221450-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x334.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.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: Pierrick Bouvier It should be equivalent to previous code. Allow to call common function to get a page address later. Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Message-id: 20250414153027.1486719-3-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/ptw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index bdb4de7c047..0ae9c5a3f49 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -3636,7 +3636,7 @@ hwaddr arm_cpu_get_phys_page_attrs_debug(CPUState *cs, vaddr addr, ARMCPU *cpu = ARM_CPU(cs); CPUARMState *env = &cpu->env; ARMMMUIdx mmu_idx = arm_mmu_idx(env); - ARMSecuritySpace ss = arm_security_space(env); + ARMSecuritySpace ss = arm_mmu_idx_to_security_space(env, mmu_idx); S1Translate ptw = { .in_mmu_idx = mmu_idx, .in_space = ss, From patchwork Tue May 6 14:41:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 887805 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2586711wrq; Tue, 6 May 2025 07:44:58 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUdTFv2nzR4duKs3ZlSarJ5ZHbWxGcO83cqRqUQSMfRi+84bWS28y601yBNcEl8VeFBSj1Ftg==@linaro.org X-Google-Smtp-Source: AGHT+IE5MsNce7fwIyC79w+XZA2HE3EGnTlJz69d4BRx1cf6YrCyZkB7wbk+ddw98DTih6PDSmw0 X-Received: by 2002:a05:6214:5181:b0:6eb:1e80:19fa with SMTP id 6a1803df08f44-6f528c3ac86mr155015526d6.1.1746542697812; Tue, 06 May 2025 07:44:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746542697; cv=none; d=google.com; s=arc-20240605; b=jrukYA4y5PKx8j5EmddHYC3yirYA1UVNfiBUCyTkFDd1lJXYOXO2u7spLJcMAeT7XM mO5b1MufXRy1w2kqmd7oeKKyu8LmkmiW5sIN+X3PpzjoF1GSishnXu20iQbYJ1MwMmyg hmthAqc7P5tR7sI2Ib0ClW3nAqT3ZLC8x/Sod2OxZXtOlRk+nAvtcsX4eZ9nORxwqVge yOUMartXmMz8yenRQPTufn9zsa04K/YrF06aOE8eTWbcy/QgcImbhAxVH0zkI8oryNu2 NXJYOiDo5Km1m9CZd/gKoXyCjovwHOj+5k4u1wUsI+n+g3I16XFY4+5v7vMI0zuV/X+u 3oUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:to:from :dkim-signature; bh=jAC8SyoVpYgwD+G/npRRAIEZQ/u3a4tNRq3WItpxT5Q=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=gFFGUL4uamEoapxQiT8TLi7Lrb/UrYTfv5Fs5n0Tc7G1EFGXqJ2H4+wnJynBYLXoUY BKQfurg8x2FsKRXIncfY0Z+q8mDCY3XPlsCyNFwe5z8prv0vzyqgToQi1zWqm6IKXkAP 7yHYrrzIMhqiF4sC94YOOB2XU7iYe6bv2Sa+6eE2JGxU7wcDKKChdl7fh5D2f8jnTQRO LiYaimCYEcWiueoRQXwNrfeK6yR8vlUXY8teuz6qZfWEGvKR0YQJ2UpquE/iE32ZSJWY pdsXZe0GhJkJMW3mF+Ys5afH0STe1kt03hazM3OKSudPnXMcE2QpHi8wlYhTU6MOu62A hWNg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=zaycUpFy; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f50f4c21aesi115219476d6.476.2025.05.06.07.44.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:44:57 -0700 (PDT) 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=zaycUpFy; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCJWq-0008Oe-Nc; Tue, 06 May 2025 10:44:16 -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 1uCJV6-0001TO-PW for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:33 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJV3-00026D-Nu for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:28 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-43cfecdd8b2so37387805e9.2 for ; Tue, 06 May 2025 07:42:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542544; x=1747147344; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=jAC8SyoVpYgwD+G/npRRAIEZQ/u3a4tNRq3WItpxT5Q=; b=zaycUpFysukv4ZlV95HFtBWwzecy/JCeLPgwZZ9hqeUjeGhvO2/w0KhGAfcWfUD72z 4iK9wx8QfDp1vbr7LPMKp4CGECm0R5twWYkoc6f5aZ3DR9qnqMtqdusIRvoeAt0QTDxZ QO5aav9qYNoyhyD2ZIjD0Hdd/G1W4ps3MNiHuDcNG8d21RCn4+pE50YPSfEnH3dNw58f 965XC/HMceGbB2GCJC47xAp7VZRJ4p9cvuCbFlcviasPt0WU3wuHdmMfrrqzDp5VuCHc j94dZkDFAnhVLEHv7I9eNA6uskiIef83vuUk862+ZXi+rGcalb/tpHkAI37OVSp6kE/c PupA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542544; x=1747147344; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jAC8SyoVpYgwD+G/npRRAIEZQ/u3a4tNRq3WItpxT5Q=; b=JSRP6qwBryS67kDBHyGM/dXwmuLrgb+RyPzZUFhl5p9Eyz2UyoT31NdcaY+W/AYtSI QUAUcgkEMIz4Hm4zxYZZXLrVmwfYcXHw2Ca/E5xsGudNE75n2biYb8y1UDdO91PA8JlC JydFcpS+6fSMc65aArWyk4clqw1XSIDlL7cNY5W+jRaxa/DIpbuO3Yh6BGWX/PB4c8LQ /kkPkyIPNC8IHQR5l+ejWw1E61Yodm+VM7mvgrHiCx1G8tr3IYc6DB895pw4AmpQfDaR Hu55Nf18NcvLk3hf0Pfl3EXS3Ac5XIQ33AM9iWmI0lub3cbigGCDiyY6I7wM0cbtWl/1 gsPw== X-Gm-Message-State: AOJu0YzisZZpoTP31OOZPa0DAeWVEnvprAowId3TVXd+B1pdpbE3om67 pvelDn4aURd8RmIwFkKCNgrwHAQBlyVYrihioZxBbmp0ITdtHuUwX/2QzhrI6wYG1qypG8ZlHub U X-Gm-Gg: ASbGncuHx/SJAs/JgAvwku/gjOAZjLi8CKDJvviVUBrY8Wbkyq53Iop7PEnIfVTrkgc Io5Mw2nzfRmTnVqwN+K1UPhWbyLREE9QL7gABtNbhNMJeqwqNBV0RxypAo3cYWcPgBSaLX53HUj pwoQEdi3zygu6pavWdJaj2YNOH9llT4UVhwI58zgwiby/GHeaHOPoiU9zxsxGrtKWvRsscAr6KT XaDsFbMWi1lpRhSK2zQ3XfkP346lwXPYOteR3X0bPz/QsuUN6jym2NTnd/6Mfhr67tD6I5pcD56 IEprU3qL8IND2XZkG8FNC9YqavFyeaybr7toczkeZF/IqDc= X-Received: by 2002:a05:600d:1c:b0:43c:fda5:41e9 with SMTP id 5b1f17b1804b1-441c4933d05mr107313235e9.31.1746542544138; Tue, 06 May 2025 07:42:24 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441b89edfc2sm169603435e9.20.2025.05.06.07.42.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 07:42:23 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 06/32] target/arm/ptw: extract arm_cpu_get_phys_page Date: Tue, 6 May 2025 15:41:48 +0100 Message-ID: <20250506144214.1221450-7-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250506144214.1221450-1-peter.maydell@linaro.org> References: <20250506144214.1221450-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=peter.maydell@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.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: Pierrick Bouvier Allow to call that function easily several times in next commit. Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Message-id: 20250414153027.1486719-4-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/ptw.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 0ae9c5a3f49..3e00e4a8bb4 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -3630,23 +3630,17 @@ bool get_phys_addr(CPUARMState *env, vaddr address, memop, result, fi); } -hwaddr arm_cpu_get_phys_page_attrs_debug(CPUState *cs, vaddr addr, - MemTxAttrs *attrs) +static hwaddr arm_cpu_get_phys_page(CPUARMState *env, vaddr addr, + MemTxAttrs *attrs, ARMMMUIdx mmu_idx) { - ARMCPU *cpu = ARM_CPU(cs); - CPUARMState *env = &cpu->env; - ARMMMUIdx mmu_idx = arm_mmu_idx(env); - ARMSecuritySpace ss = arm_mmu_idx_to_security_space(env, mmu_idx); S1Translate ptw = { .in_mmu_idx = mmu_idx, - .in_space = ss, + .in_space = arm_mmu_idx_to_security_space(env, mmu_idx), .in_debug = true, }; GetPhysAddrResult res = {}; ARMMMUFaultInfo fi = {}; - bool ret; - - ret = get_phys_addr_gpc(env, &ptw, addr, MMU_DATA_LOAD, 0, &res, &fi); + bool ret = get_phys_addr_gpc(env, &ptw, addr, MMU_DATA_LOAD, 0, &res, &fi); *attrs = res.f.attrs; if (ret) { @@ -3654,3 +3648,13 @@ hwaddr arm_cpu_get_phys_page_attrs_debug(CPUState *cs, vaddr addr, } return res.f.phys_addr; } + +hwaddr arm_cpu_get_phys_page_attrs_debug(CPUState *cs, vaddr addr, + MemTxAttrs *attrs) +{ + ARMCPU *cpu = ARM_CPU(cs); + CPUARMState *env = &cpu->env; + ARMMMUIdx mmu_idx = arm_mmu_idx(env); + + return arm_cpu_get_phys_page(env, addr, attrs, mmu_idx); +} From patchwork Tue May 6 14:41:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 887811 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2587871wrq; Tue, 6 May 2025 07:47:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWA/jtPD4nTIc6J7svqCjdXltxjh7dWCggpWpTA53RJZhdYliqFV3Yz/9IVPLRLcHxMMqh1/g==@linaro.org X-Google-Smtp-Source: AGHT+IEhLzAkcBMMSxkqSxm968GfxnsFCG1OlRnmFFJ0BzCoJjXnlo2G9eV3fRZSy31CciWZXeUr X-Received: by 2002:a05:620a:4556:b0:7c5:5e5b:2fdb with SMTP id af79cd13be357-7cae3aeb318mr1560155585a.41.1746542830767; Tue, 06 May 2025 07:47:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746542830; cv=none; d=google.com; s=arc-20240605; b=EhmG7Xz7dsSTBZUaRdjT7btFX3zKqrhTO2VD/KEQzrpVtyja2RIjooO/caCU53Q4S4 KrfrpXwSgGVzSZtf6qfXKVVOhSSO1EPsWU5Fdl/Af8mn8e3uIpyDKEx3sifUBVsXAf80 s5AL8Lip9tyWTaqOCwAySf47b8iT5tqFm7CZpgGtGRHqSxfhXCMzRxNpYBK1famk2nWc RbzllufbbNXYAaOplZnxJKQxif32FZFQ5tUdSf37YAihYL09nHn395MHotjTpzh53irg vxntXd02fTjVDw4YDXVDkTUXhp9vbkbBbeiSqA+K+iVig+eob3pc2RJ5Vfr0KU3eltbN zu8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:to:from :dkim-signature; bh=EE54QuMwHQWEnSKffQHIxH4iI4MordfjnZWjYY41Z1Q=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=EbBcclTzNetsUKCDzkrec7gJ15cPBXYqD1j9UnU0eILQkNEuFMl0lQ96loG2wWIPoD RnAuGBtfTnz08NGlut1B6doL10Z4U7sGYoyPPB9Ja4HK954nUiX62s6gXJeawNomshl1 i1+2NlpuYE54HUP2w5N/x5r7ET1o5vnPiX7BkdqrTCYQmtstwUeVM8fffhxzp81iMVcS +YMNS0YjV2ufdAc/HoG1ip1AF5aDdbtQMw+g1PkTJfFe0eRK9OXZdViVy6yXeqN2E8Fm X7hzvfCtj28gvanaE15WpxrRdnCaI7CjLKvZ1QmHWTc7dPgQRM+PnKDht1JqHKvj/o6v QVtQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=zQ5dN+wA; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7cad23c7bc4si1087949885a.144.2025.05.06.07.47.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:47:10 -0700 (PDT) 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=zQ5dN+wA; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCJXd-0004RN-Os; Tue, 06 May 2025 10:45:05 -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 1uCJVA-0001Ts-1w for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:33 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJV5-00026P-R2 for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:29 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-43d0359b1fcso36187785e9.0 for ; Tue, 06 May 2025 07:42:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542546; x=1747147346; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=EE54QuMwHQWEnSKffQHIxH4iI4MordfjnZWjYY41Z1Q=; b=zQ5dN+wAYQugZ7q5B5Wyv9txVk5Lr/dSYD02028u8FLl9H21bjLT9NJL+9yfnPEU9u 2gLl4EKeZLKJK501OwCcO7QK8S8wSEsV9kwmibsymMdQSV990G/08VGP6rCFV+Xs0dZ3 sQ6Cq0OPfS+h1M8JNr6VKYddT9SlpyV5uUszNNEQqq3tHqvSifCN/O84dlZDDinkB/Sg /wxrZ+7Yi6qvIqGcDJal0W7VcfUGvAEsBLm9n+v6aGDy2PLrA1LF7TwAnK4hlU0DFFfB 3b395HQgN5Pnyl8Eo4wW/vCYQGC8unR62Ga2j3JM23LyOT+XsDjJSi7jrn63uezBX9xi 773w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542546; x=1747147346; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EE54QuMwHQWEnSKffQHIxH4iI4MordfjnZWjYY41Z1Q=; b=VqW4sxb0AobBFbOJI1sqCdXoDHUTOKenwJEpKRZL14HN0uVRTzZa5UxBAkD6kN1vCx EBZEGN3uhZnfZShpXB1FUMyI+inyRJ/3G0fUxLAu9n2uwztQQS7IX1DfDvz6oZo+H15b 1Ntx5J/mCNDDYFp60mtpJ4jeX8WOjnD930hivgrbnifUAGPQ+uj6fydjxy32ed4/yEG2 7cTB2qXXg3qCMPiR85+MCMqme4xFevovd/8S2NvyCFTWKOvRQa510lRBZ4D3Fmw1IJYc vfsesXpQDq/iLlXeJNuLEahKnM8yXBxGz8Ie1eqXNMG1axlb/E+25IGtT1f4SFnPI9sm S8Fw== X-Gm-Message-State: AOJu0YzVA3y77R4B+h8gnq7PFQpbs6mkj6z5o90GGd61VOs03/OkspSP 2Iw88KfVCmYTAC8wOSw1poGYXxZj7ZZ9srfo3rmz6a3M4/khFtjhNRDyMn8FjOW0ZLnLAiGpU8k 6 X-Gm-Gg: ASbGncspG7M2JzgC7WzuaaWCGQIt/h9bufktcYCOyMlQVsmm43R1qyCZbeGGGjCwqlC ts1JJFfMTwH15APXlRf4KijiJ/co6HBGHlZ62j0HmGWVaYLnZBjMP7sPMq/O1be9Il5r2c0fvuj GiUDnruSnlL4GlaRJnTYYUY+sfPSXQl66tDdQPydO8TRhxtxmQzdlJesW0ccEC/TPyLfW7Q1Tte y2f6DJ02i0PI2qy1y7TD3i57syV/KlFz4H2s8wRAWu+hmaIz1olR5jT+cwglprFJnAMO7Asa+g+ GwkeUORxJnT+36zhs+wENCMlMfMbkEnO0g8FWcd8IjEfcII= X-Received: by 2002:a05:600c:4e14:b0:43d:fa5f:7d30 with SMTP id 5b1f17b1804b1-441d3a821e4mr86025e9.16.1746542545848; Tue, 06 May 2025 07:42:25 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441b89edfc2sm169603435e9.20.2025.05.06.07.42.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 07:42:24 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 07/32] target/arm/ptw: fix arm_cpu_get_phys_page_attrs_debug Date: Tue, 6 May 2025 15:41:49 +0100 Message-ID: <20250506144214.1221450-8-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250506144214.1221450-1-peter.maydell@linaro.org> References: <20250506144214.1221450-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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: Pierrick Bouvier It was reported that QEMU monitor command gva2gpa was reporting unmapped memory for a valid access (qemu-system-aarch64), during a copy from kernel to user space (__arch_copy_to_user symbol in Linux) [1]. This was affecting cpu_memory_rw_debug also, which is used in numerous places in our codebase. After investigating, the problem was specific to arm_cpu_get_phys_page_attrs_debug. When performing user access from a privileged space, we need to do a second lookup for user mmu idx, following what get_a64_user_mem_index is doing at translation time. [1] https://lists.nongnu.org/archive/html/qemu-discuss/2025-04/msg00013.html Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Message-id: 20250414153027.1486719-5-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/ptw.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 3e00e4a8bb4..d0a53d0987f 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -3656,5 +3656,25 @@ hwaddr arm_cpu_get_phys_page_attrs_debug(CPUState *cs, vaddr addr, CPUARMState *env = &cpu->env; ARMMMUIdx mmu_idx = arm_mmu_idx(env); - return arm_cpu_get_phys_page(env, addr, attrs, mmu_idx); + hwaddr res = arm_cpu_get_phys_page(env, addr, attrs, mmu_idx); + + if (res != -1) { + return res; + } + + /* + * Memory may be accessible for an "unprivileged load/store" variant. + * In this case, get_a64_user_mem_index function generates an op using an + * unprivileged mmu idx, so we need to try with it. + */ + switch (mmu_idx) { + case ARMMMUIdx_E10_1: + case ARMMMUIdx_E10_1_PAN: + return arm_cpu_get_phys_page(env, addr, attrs, ARMMMUIdx_E10_0); + case ARMMMUIdx_E20_2: + case ARMMMUIdx_E20_2_PAN: + return arm_cpu_get_phys_page(env, addr, attrs, ARMMMUIdx_E20_0); + default: + return -1; + } } From patchwork Tue May 6 14:41:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 887825 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2588716wrq; Tue, 6 May 2025 07:49:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUdfNnIXWgpVt3QKkyol7HvmQXTes8yuiRKYn9W6R8yENI7R6WIAkSshjRkNhaDMuIwNxZK/g==@linaro.org X-Google-Smtp-Source: AGHT+IFg+zxzjFBTM+os2xzpNpc09x3CDUOrPDaP9838ASrQcYBuCXjHiHJNcv7g3cyWLZPObeyI X-Received: by 2002:a05:622a:5588:b0:48d:7f4:ba84 with SMTP id d75a77b69052e-492021c3b0dmr506951cf.25.1746542954284; Tue, 06 May 2025 07:49:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746542954; cv=none; d=google.com; s=arc-20240605; b=DQ1rSJk7sfIMQw2XrjfJGjZdN4snTJfEYobBEvfj7jhCjOwPX6m26FahJ9g7efUCvE ETXLCsTCnRhY/xc/WOUVzCjTJ5EVLFYFzEiZBCzdSLEs8HgOhFN/XBWpd9/tvsuLRxjB Cpa1GvEwwKKpR1fLb2FO7vBfzMA++OHzOzRJluvQ9CFav71ehR0dAEkzU6Fx3ucTwef5 8ny43AcqBWWiCs7vo9RmIbGM+LEjcCwjNtoZnleR7jOYZEZNBsGFYMyRrntFCSn0pLBf UTyhGdNNEb+dUl3Fuxn6vC30uF4YyoN78kgFfjY2/vrP3NmJ77tt18F2mJnbWcj7c6Oq nm1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:to:from :dkim-signature; bh=cZw/ZP8Vznbis2zvfPW1P/VpXk0UFQxSXnKxKLB26gg=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=bG+gKYbB1V866lH076HVVhVXVtVkzpafPw4+B0xHjc2zWksK6XRnk0JOpKr0pXn0uw EVQXKLTMwe0SPOsp75oQslp4X7lvxi16gdKpD8HzDC0a9AfoRlYRr/dGubnF1//kDLu8 l6zsnLWNiLgjDFseV2Rx+FmE6pq+EKhp9gIA4BoQbQ5D4eBHpiZNgWGVTSyBUjNPVcxC vdRCz6y7l0WuSFGh2vVyHWC0l7UnjqXPXyvg1Cv/ZNN6wTUa8PatlVHyaw+My2GoIMSN HoVZKdCrol5sbfEwZSThrCH51vVDnzC/BymXstE7+lH1NkWUO5XprlWx9678IOfwWbL3 WH2w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LjWg66kK; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-48ed64b5911si58741181cf.331.2025.05.06.07.49.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:49:14 -0700 (PDT) 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=LjWg66kK; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCJWt-0000O7-UZ; Tue, 06 May 2025 10:44:20 -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 1uCJVB-0001YS-Kk for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:34 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJV9-00026m-Oc for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:33 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-440685d6afcso50602325e9.0 for ; Tue, 06 May 2025 07:42:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542547; x=1747147347; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=cZw/ZP8Vznbis2zvfPW1P/VpXk0UFQxSXnKxKLB26gg=; b=LjWg66kKrtYUAMoCaNajwf/UYRPo3igwp4ZmisvawBX/mSMPc9BF/LXxiw5KfjfOOh 8M0Mah9V37D0U0HUwaJHonldAw9Z1PeEQ9UP2Imax9Xh5txY2RXuHSYqNgURkpmizJIb BnRgPQ17dXnR9ZULoCaewqlotv0+nA2RaBoDVVqK53ABVoqbCpg28c3awy93TlWmqvGw 8HGoXElqrYrtjNSpdTh5OQDM3nKH0afaKNBnxBwVgtoxQXBhXP/RRkMpzSU+vuBzjCSN fz1cc8IPXeHDS2iAnbXSmYOy8lGJoDQ3Zamd+rPMGVNhBWHQ5r644xPteOWAYzqDcVDC k3Gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542547; x=1747147347; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cZw/ZP8Vznbis2zvfPW1P/VpXk0UFQxSXnKxKLB26gg=; b=aekn0KWByGQG0T2w3cun0jwo+PLBSW8FYyJ9+pbl4fnbyRYxyciDZoWJlv/gO3JMR9 1yVxS5IQqITqKyew6DIVLx3RpOn/x8WEWL2agNf7TrxmstqsDN7sWIGkoZ9XAx99+yDb wYekFBbTi/BHKKlJVkIx6A48Nq0i+HpoKsrEh/0peDMsTziNMpLNj4bXAtLKyCzXNCpO DAxw2URVZlasWcTIVVzSBfVw9vkm3NCZ1hpCN7SVG8WdO0jl/5Z1yjO0BQauBDv6EAcp iLXKTW8PAlnjUO/1MZXcV8yaUYYdIDM6T5yfCyxq8VdGUjUAZNbxH57jkmBmgN0rd5+/ g21A== X-Gm-Message-State: AOJu0Yyv+Q4z5PaDxAus2O8QFqN7uSEDKucf4lLKl2s55IlT/9Px+r7m ZECYINyX+sN40Bs0NF6XsD2uXFwEkbfO8IlwUc6ne17qaFhYLsZ3tSLpNt6T7KNByu6APcz1kHP Q X-Gm-Gg: ASbGncv4z1VcB+vl1XwnSCQh+BTR7f0EpXV84ddNK8cqO1BWAqP7J9mBbx7qJdyQsrF PRxr0T+GTl3vMZtDHFcC3Vv/hp1FZ3S4nWKl329K8CaP3u9hjwxTfb6oNNrXqrGnBOGCxhbIUBr KLHH6VQipDBssT8pEJ8ko7r5MWlUGptihefzo0i28m4+SFDha3eAcCMQmyyUkvWQaDn26SuOA0n yJyf1vIo15872oelh8WQ8Ma3zOYfUzQ7GAs9UGIbEbKXrqppSuCQLdcpwJSkbkkJ62GbQcH4vpY 6K2wteD5jfrcSW9PzMIR3UC6kC7Urb9L+UZsxcb12OST6tEeWrZ6B2+ngA== X-Received: by 2002:a05:600d:12:b0:43d:b85:1831 with SMTP id 5b1f17b1804b1-441d0a31ec5mr33723555e9.0.1746542547360; Tue, 06 May 2025 07:42:27 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441b89edfc2sm169603435e9.20.2025.05.06.07.42.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 07:42:26 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 08/32] hw/arm/virt: Remove deprecated virt-2.6 machine Date: Tue, 6 May 2025 15:41:50 +0100 Message-ID: <20250506144214.1221450-9-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250506144214.1221450-1-peter.maydell@linaro.org> References: <20250506144214.1221450-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32b.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé This machine has been supported for a period of more than 6 years. According to our versioned machine support policy (see commit ce80c4fa6ff "docs: document special exception for machine type deprecation & removal") it can now be removed. Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Signed-off-by: Peter Maydell --- hw/arm/virt.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 177f3dd22c1..17a88aa9b25 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3667,15 +3667,3 @@ static void virt_machine_2_7_options(MachineClass *mc) mc->minimum_page_bits = 0; } DEFINE_VIRT_MACHINE(2, 7) - -static void virt_machine_2_6_options(MachineClass *mc) -{ - VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc)); - - virt_machine_2_7_options(mc); - compat_props_add(mc->compat_props, hw_compat_2_6, hw_compat_2_6_len); - vmc->disallow_affinity_adjustment = true; - /* Disable PMU for 2.6 as PMU support was first introduced in 2.7 */ - vmc->no_pmu = true; -} -DEFINE_VIRT_MACHINE(2, 6) From patchwork Tue May 6 14:41:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 887844 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2591023wrq; Tue, 6 May 2025 07:54:40 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVvQyav55mt43Ecmj2Pt2SLPwKLvnF2QeV4m+1AY2urULcmtGh4eamCnGO/Fk86IiyJKgYu4g==@linaro.org X-Google-Smtp-Source: AGHT+IHqn7thx0aUAYZ10DkD9jn0kwuojsNRLu4BVC3KAYdY88555tUuhBdtz8HRkiNlI7j3GVrX X-Received: by 2002:a05:620a:2588:b0:7c5:4c6d:7f95 with SMTP id af79cd13be357-7caf11bceecmr434660485a.48.1746543280575; Tue, 06 May 2025 07:54:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746543280; cv=none; d=google.com; s=arc-20240605; b=hmEU9r6O+ZwxdPCkyZAoEaIx2YEf1cGXR/2XFdbmexzfiyrlKx9rjUkbJviQuoRY3r eYVKUmv3F3+XKc0YuPLmveB45rt+TB1m6pnVlx9dh3LeG0awDdDsJUy6Xw0I/pM3w9jR GIfSTT4DR53lJy7+AeccfJt2M9WTbx2PKVf6xAavlOfkRw6j3aOQSGwFN0yrC8nsicHd XUBPSGis+C64KN+Se0UxjfOiqJPFxXMXlAtEx2ckI2nbkfv6g+Q0FIQCGAg0dXbZ++0i PAR1FN5h5qG3TRYp+eM8iv7XXdAEirI+9BfCJBmhBbLtepP94oNwpwoQ2Z9UHkbnFIB4 taTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:to:from :dkim-signature; bh=Wi+lV0/pTudn7Ibuemmr2NH/wCQ4m7bA75r+AsmlHj4=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=fBsF+NLArC8IZUN4DhQzPx7WZoOIiwSV0hGTkfxVyAkJ+fiPFVzM2qSyLh0WCf6t/z ObmYqWCjzWmC5Mfybwra8vA6VLqm8r/q5m04Uz7RbxJ+45AFBHqEZrRSjXjVVETlPSTa IxLuxT4Is94VxBkp1iwRvFgP+n2P0oYblYf/hvgevSWV5bUviQbAdB3lgp6h49csrD0z NdNVHQkvI6IwXi17fX+hd3hugUWa3FTxVN9l35xkw4+8cr9tQ+YVAmvsPyyR0GDYd6NQ inLsFlHiCK4CfSNZXiqG0mILfyP2tK9Y+gAlMaSft+NP/Zs5c/rrjTRsNcVL6pd0tSS9 4kUA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=yMYJ6xAf; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7cad2420009si1215176985a.274.2025.05.06.07.54.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:54:40 -0700 (PDT) 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=yMYJ6xAf; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCJXn-0005BL-3U; Tue, 06 May 2025 10:45: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 1uCJVB-0001YR-Km for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:34 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJV9-00026y-Oi for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:33 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-43cf848528aso43119635e9.2 for ; Tue, 06 May 2025 07:42:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542548; x=1747147348; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Wi+lV0/pTudn7Ibuemmr2NH/wCQ4m7bA75r+AsmlHj4=; b=yMYJ6xAfG2gD/4bUjNTawPdqzY4RtmIbA/HX3HE6j41XX1oRHi7W+dcmRZH2zYkewt NHET5l5wiwon66g27Hzuk50FP7gbM8pGdGgwTAtWAh3kwaVsM/Jq+AWUwEsLQ+fZUUbI lN4DbwwohlP7quYzsmtGIrovEJnNKAofYXqL05j64WBDPE2GAuu9nA2jsaTROAQl8wZQ 6N1rExMjneWGDEG2u2mVfi4N3Jn7EuDDOI5lt6Xo40GICZtHPmaWsoeK1QAjtx9CkqyJ PyWfJncNfFLxnlyL0sWdilOFBZxj4cI/35/D5lWRyeZrrXqTvo2cexGkESz8esuAm8M3 PoUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542548; x=1747147348; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Wi+lV0/pTudn7Ibuemmr2NH/wCQ4m7bA75r+AsmlHj4=; b=fFMM45w5Ek1R4CB/rP4akv33zyZJ4weqeRHDJIbjArQcia4sNgB6jhvllEZRYgibRr toUuYFNOck/3ktzp7fpE3kfHy7ZR3YLwuoEezp2MfCsR0DcVTkwIriAguaG+WovlTTjz MyJHcz+jf3ZGmedlVjD+pfbMfCYT1uwrFmuRS+zodl1/oaQb2geLIn4RKgapIWAvVjb/ CTZ5ao/nXS8b4RelU6Kw+4dPqtvjIz2Uw5AzWd4wukS0e5DREAuG42c33wntZzkJ/8Hw WYvcZUFUlFA7rbayp2qFX22ELyPZlvg4KUcZVudD/0LLxE9DUxd22u+q/XzgFnu5m1Te rRNA== X-Gm-Message-State: AOJu0YxGz5+8nZZf+F0ABmGePLy1dFK9KvltNk46y9cI34RR1OG3UziU S0lLsR6DarivN3OEowoPKHrn2q+TB3Xl6iEQ/YTdvjTYEigTXAWokzUKecIh5ly/8PqJ74BGLxp 3 X-Gm-Gg: ASbGncurF1FygRCxfTqi7YszRAtXAea+TJM+I93hzVLCEQnvmnj6NRvOsE0vku7Bebi IhpOZQsmOHacmiMF1Zop/fxch9qMPrzBP7BVj56+WxOw32g0N6G9Z44Q7gIruBYTRwE95P5Xmqa woj0XH/n9yWwoqh3VeZ6OiuNbz3Oi3LTUzc0GNc3GPDy0tOn90vgIpD3A6x1i1qc0sAt+N6dVJ3 iS/atJXtlLkQnZf1bbaj8ltX2Fu7idBHVwh0mvNs9MF0TeuUnNQc+Me3g2qj+/K0QiKaKtIncGe Km5l9HMplfxc1APjwCOlOhjTqliz6e/d+Kpm1PHdq8LVI2w= X-Received: by 2002:a05:600c:1e85:b0:43c:ed61:2c26 with SMTP id 5b1f17b1804b1-441d0fd2c76mr34942545e9.17.1746542548226; Tue, 06 May 2025 07:42:28 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441b89edfc2sm169603435e9.20.2025.05.06.07.42.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 07:42:27 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 09/32] hw/arm/virt: Remove VirtMachineClass::no_pmu field Date: Tue, 6 May 2025 15:41:51 +0100 Message-ID: <20250506144214.1221450-10-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250506144214.1221450-1-peter.maydell@linaro.org> References: <20250506144214.1221450-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x329.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé The VirtMachineClass::no_pmu field was only used by virt-2.6 machine, which got removed. Remove it and simplify machvirt_init(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson Signed-off-by: Peter Maydell --- include/hw/arm/virt.h | 1 - hw/arm/virt.c | 4 ---- 2 files changed, 5 deletions(-) diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index c8e94e6aedc..27c5bb585cb 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -120,7 +120,6 @@ struct VirtMachineClass { bool disallow_affinity_adjustment; bool no_its; bool no_tcg_its; - bool no_pmu; bool claim_edge_triggered_timers; bool smbios_old_sys_ver; bool no_highmem_compact; diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 17a88aa9b25..e82b8a45664 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2273,10 +2273,6 @@ static void machvirt_init(MachineState *machine) object_property_set_bool(cpuobj, "kvm-steal-time", false, NULL); } - if (vmc->no_pmu && object_property_find(cpuobj, "pmu")) { - object_property_set_bool(cpuobj, "pmu", false, NULL); - } - if (vmc->no_tcg_lpa2 && object_property_find(cpuobj, "lpa2")) { object_property_set_bool(cpuobj, "lpa2", false, NULL); } From patchwork Tue May 6 14:41:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 887839 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2590127wrq; Tue, 6 May 2025 07:52:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUHDC7V5BsHc8EoUN0qr2mtNnNskcNua7pLIJ+JtyfLLmnLixqOoBY5FJl24jfKA2bg60DGGA==@linaro.org X-Google-Smtp-Source: AGHT+IG1CRDRKLs74K28A1WmjE8ifAko9CI8404UQznKVKXjHdaAedFzxechTJHNzqcUUQjs7mJ9 X-Received: by 2002:a05:6214:1d04:b0:6e8:f2aa:a8b0 with SMTP id 6a1803df08f44-6f528c7e3b2mr213171556d6.18.1746543145934; Tue, 06 May 2025 07:52:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746543145; cv=none; d=google.com; s=arc-20240605; b=a1Tpy0OQoRR4Oi3w97TYAyv77/AtlXI/ISuJD9LHegHTBVv1zCscImXGwIXE1a781Y 7lHnQXhp/Mc26rZHtYWrcfmEyvu+hfE5s1x9tKrHeCm6wm/gdjkQMp/9Jj+0EEO9/V91 JGp+WtU/9NFz3kZ0+z49uOm4OJcl+gD5+9wJn0pan/lB/O1+AcArSkxq6Wz35N1UIJ4o VIMSjkNoC8hraefrk9Ow7biPtwdF82+Psj/OsVHXh65sAA4r/nHv5Ky7hgdyTVZt8518 9jbpThQmDqYlZiJZTQkiQmSAMVN3/pm/huRUx3HdyM9dBaUjLCXtG6eEAf1rkqJ1VeI2 3P5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:to:from :dkim-signature; bh=Xs/iC588/V7o70GcvxZgF68fgUadmPr7lsPrdvAHcow=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=IR1c/6M63Oz5m2WAR5OlHnT4wyO26bwJdyb8Wkf4pCx8NNcmUM8z43dqZSjeVYDo5p ZTwdysfIqEgt0fgF8XBsVfb0V9olSdsIwDpwKaVIKlcX6aNxswXsykmUFFD8alQD+zoU wjGZZLo9aCTZTafd5R6k8nXUmBhMbAadOQLEwUv8zVoE/bP0gQsvv0ALDJf5/YQdJtjT WTdhbCG+T/Ay1vzfGjwArBQy68OCkN6f4Es5I2SrsrVCiUJl10dbswM0Twz2I38crCsT I83oMui+KHnAhpP095RfZO5X4HvB8d50KozFPjVhwNMcjDSGxpeaI+8QJAAm5+g9WKVT mNEw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OHuE5VMv; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f540255e98si3491066d6.488.2025.05.06.07.52.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:52:25 -0700 (PDT) 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=OHuE5VMv; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCJWu-0000Of-PT; Tue, 06 May 2025 10:44:21 -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 1uCJVD-0001dO-Bf for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:36 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJV9-00027D-Od for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:34 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-43cf06eabdaso47136135e9.2 for ; Tue, 06 May 2025 07:42:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542549; x=1747147349; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Xs/iC588/V7o70GcvxZgF68fgUadmPr7lsPrdvAHcow=; b=OHuE5VMv70IG5URuUsgETrstKAEJ9V0CyYVqCj3xOHqlNhdcs4M8W4QeCoUlYmSFEI hSeDWeYvIO7yaZBnV76xsauFs/bgZFf/DagibgbIStU61A8jQTLcyzQT+9GfxvXK8KAt tNp7z3qyum64yfdm2bzzszr6bPjDj4NexhtDDmLCvn4f2ZKQ9QvZdoOK9iluyZ9HOBXL UW6/AdHFotupWXmjpcDaqQAo7lE/Xi/5XdEIltn/uYXEorBLtaaY52Wb12wLM0N8Ropk 6wXmuIEm4lTX0N4k5uSWkrZJrQEUcXoTbPXgBJ9YcqjrMmCvZBnpPPmzz5N7fmOqLbOa PRQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542549; x=1747147349; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Xs/iC588/V7o70GcvxZgF68fgUadmPr7lsPrdvAHcow=; b=aiz73NgJP5I3L7f2NKKtngxcY+CkrCSYGzlSic6YI54Vd3msJ/8RDIy/f/WFi3wXSQ 8TRma+l95s3iZBltbw9/hfLt8epfr/TQEjrosNyCYdtuZv8FjCJl3Al8rQGID55Tc93P bOlkJgBFdCF5p/PEIAjlewzSxsWS24UDVcTLez22Fk+P7qw2pSV73z/3R+Z1kwxsS1d9 ODpIxAQfuZBpwvBYUCgezZ4TOQvNx1vw8TYzT0r+8or7D57vk/1HjrVjzsTL79GzJ4Yc 9Oc81UVIb8zrnUSIhuDXwfeop5kqmdEKD9SddRGS8VbqFw8gmdArdXvTu5PqmHbtyKfI xFyg== X-Gm-Message-State: AOJu0Yyxg1vdThlUUXtDp3jr8ftymUvLspC1g2OSrdq67C1wavQaHQHM kj1UCj8sAHmJEaJ7G5RLs5dp2pmMy3/V9wapCVGld/n9dQIllCNyPXUbnrNK6Ax6Ycsz/j5sCMX j X-Gm-Gg: ASbGnctMLJE/p9JWNGg9VMoY81dqhsiKiBlhD47pXFaBXcfovSlQ58p6gJalgDN56Qm zLtJ7ZcjZMHDJz8VwG+rRzKxLlf4y/SynrDm/DI8amW28aLe/761Po1kPV3OABtF5Biw/beemF4 oEgZAsTQojMmLLhOieRzOnIe0JmQm5dnp05G9qPG085esK+JnxnVJkWTKRbdg66yffEvZqHEAmX hvmdKHkV0psD54VcTln0Ll9ykcaIHoSDA1A1Qi8oireE/a9Ke+YPK1++zb5DXwRL2sJhZUA6lvJ sEP7VidsLcTM/kHqx4K61G/wqu15NwMMqmSYPi91njgxJk0= X-Received: by 2002:a05:600c:4ecf:b0:440:6a5f:c308 with SMTP id 5b1f17b1804b1-441d051b271mr36448445e9.13.1746542549107; Tue, 06 May 2025 07:42:29 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441b89edfc2sm169603435e9.20.2025.05.06.07.42.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 07:42:28 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 10/32] hw/arm/virt: Remove VirtMachineClass::disallow_affinity_adjustment Date: Tue, 6 May 2025 15:41:52 +0100 Message-ID: <20250506144214.1221450-11-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250506144214.1221450-1-peter.maydell@linaro.org> References: <20250506144214.1221450-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.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: Philippe Mathieu-Daudé The VirtMachineClass::disallow_affinity_adjustment field was only used by virt-2.6 machine, which got removed. Remove it and simplify virt_cpu_mp_affinity(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth [PMM: Remove now-unused variable] Signed-off-by: Peter Maydell --- include/hw/arm/virt.h | 1 - hw/arm/virt.c | 31 +++++++++++++++---------------- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index 27c5bb585cb..5d3b25509ff 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -117,7 +117,6 @@ typedef enum VirtGICType { struct VirtMachineClass { MachineClass parent; - bool disallow_affinity_adjustment; bool no_its; bool no_tcg_its; bool claim_edge_triggered_timers; diff --git a/hw/arm/virt.c b/hw/arm/virt.c index e82b8a45664..9d82cf78b0e 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1770,24 +1770,23 @@ void virt_machine_done(Notifier *notifier, void *data) static uint64_t virt_cpu_mp_affinity(VirtMachineState *vms, int idx) { - uint8_t clustersz = ARM_DEFAULT_CPUS_PER_CLUSTER; - VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms); + uint8_t clustersz; - if (!vmc->disallow_affinity_adjustment) { - /* Adjust MPIDR like 64-bit KVM hosts, which incorporate the - * GIC's target-list limitations. 32-bit KVM hosts currently - * always create clusters of 4 CPUs, but that is expected to - * change when they gain support for gicv3. When KVM is enabled - * it will override the changes we make here, therefore our - * purposes are to make TCG consistent (with 64-bit KVM hosts) - * and to improve SGI efficiency. - */ - if (vms->gic_version == VIRT_GIC_VERSION_2) { - clustersz = GIC_TARGETLIST_BITS; - } else { - clustersz = GICV3_TARGETLIST_BITS; - } + /* + * Adjust MPIDR like 64-bit KVM hosts, which incorporate the + * GIC's target-list limitations. 32-bit KVM hosts currently + * always create clusters of 4 CPUs, but that is expected to + * change when they gain support for gicv3. When KVM is enabled + * it will override the changes we make here, therefore our + * purposes are to make TCG consistent (with 64-bit KVM hosts) + * and to improve SGI efficiency. + */ + if (vms->gic_version == VIRT_GIC_VERSION_2) { + clustersz = GIC_TARGETLIST_BITS; + } else { + clustersz = GICV3_TARGETLIST_BITS; } + return arm_build_mp_affinity(idx, clustersz); } From patchwork Tue May 6 14:41:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 887827 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2588834wrq; Tue, 6 May 2025 07:49:31 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUgr+xmUYTv9kUSMFaLa5Wtf5C2mPlX5DjlEniI1OYwkicKoDrZX4pr+YO9wWt8zmxZovH7tA==@linaro.org X-Google-Smtp-Source: AGHT+IFdY7lrCWKVynJ5eQmGA9cp2n0+X1/4mVHj/FtP7ZGWqjqrUnDvcXPEjPXf26As7NFYHHEl X-Received: by 2002:a05:620a:26a5:b0:7ca:dac1:a2b9 with SMTP id af79cd13be357-7caf11bcfedmr533222385a.50.1746542971006; Tue, 06 May 2025 07:49:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746542970; cv=none; d=google.com; s=arc-20240605; b=aroYjR6WWYkSbWt444s9LIkN/ZAfETNKQ5elyKLq068h+zMpJFqHeIhfR6iM0wDNYL wM/0dVrTESe0pVJe13GQ24VbSCLApVQ62MUXyHHCO/2ZwfvbTclscihp+7xvqptgen53 3mzbDZBGz/nxHzQQWRyN+mB4UpEEQHES42diQkKkL5/bFKYgRtpAnA0Mp5NgCD/pmMaq NVHTyH7FqUQs4953079s3ENiplriLqRl4Niaf4YB0NTR6LzNI6yQpyRJ5KTh3DB4SeBM 4WiOFXU2QbRlaNffigNva4RYMDVSc0KiSb6nfpA4LiCqN7n6pMLdeq6Us2pXrRrFlOnJ 9SwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:to:from :dkim-signature; bh=LxlT5ltl+62C9HFS06L3ExxGD28tq/piucc5fALXoww=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=Je2+0GLTH3yudyq+aP55eaIq5DPcqPUZaHqt+g/w3Oz4kwyNR+xls+MwZxV88haAJF UIWP0uzvs2DFv3WIiTPihADbrZ4HuXwTLpanDSIUl2o3rIB57/eddPW3Hyx1vpYCVTpR 3n24dpm4b2qtDOGeBDCnFoO1haPyEclwK+mFQKP4CkD5ZvLkOcPjxX2v98V++NTpVl+g 45sq8i7cVwt4q6MjRmrmsiAzORKlTjk4N7Wao5cMrxaPfCKnd16cYTbiKQ9tZmyAHPRm scpQg1ZRcGj155yPXFTjJ+d4p+N1A/HAi9KWFhZp1sf4UkpQgYOwYZOTkDECLI44rj4L Weng==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JatjqQPS; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7cad23cbab1si1143823985a.173.2025.05.06.07.49.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:49:30 -0700 (PDT) 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=JatjqQPS; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCJX0-0000pD-Ez; Tue, 06 May 2025 10:44:26 -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 1uCJVD-0001dP-Cc for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:36 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJV9-00027J-Oh for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:34 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-43cf05f0c3eso35844305e9.0 for ; Tue, 06 May 2025 07:42:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542550; x=1747147350; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=LxlT5ltl+62C9HFS06L3ExxGD28tq/piucc5fALXoww=; b=JatjqQPSNU73oBaehwOUR74cAT4Z1+GkroqWDiEUpcpf/wrBSasTL86HYPd2vPs+qH 945bqntpoiCf/HCHg4uaziJCR5VzetfXvE7ECmCL7r7kD6/BJieUsQInzOBDoQF+LzmD Fq/GJodMjqpaFpk12ZDslu6d3AjzQwbGHFqgFhiVgyjj1TzSzGDlQj+6PRY23IRFvxgX rPgkyZE02aRMDqrMO9xaPSLfOF3cDyMJ2oT5r+734WBiteZyeNEtt/C7Xaq6TWhMFmA4 hQjQJ99bQxznpql2yFkDjw43WZvQsgua8ekCPAOzuhZroXu1yfDqmTPLPJPpqP58x2ys d4TA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542550; x=1747147350; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LxlT5ltl+62C9HFS06L3ExxGD28tq/piucc5fALXoww=; b=Fjnc9hbYaiey4h5q5pt7+W6R99Py+QbL6rMluz8TqvYA05m8zzqSydMPjsAeLNPMI3 rkpULbdeRVDVrXsjrGc1QryRKGJJu90GszaWoL4xusaY5h4c+14PsfkqFfeCqvsBTpnT P9+MmZ8n5F+onhhQJSCL8gi0ztmhnnLnC6/ESUhqfqOXptTBJi03A/lnffwnnOAAtQ1X 6SlNunQeC+JRxO3E95S50MJMg1kaDJ9vSXME24WOq53/RMh8XAg7n90PK2JHhFk88GRx jTkEGZc/GSlN7/jW/PC6EPAmGOcRFQt2ye3xIg5HB1nukljMEKXjyctp5i9m+Lytu3Y8 8tIQ== X-Gm-Message-State: AOJu0YwN1nIJ2LpzzrEdEsoPF2uhQQV6V897EUhKDk5duaiVksm3uoJ9 5H2fPmKGlQB5TKP7uhaG8XXCCz1bvL8bPJR2/vOXFN512XKE9R30TIrjtU5YnN8WittkAltZJIu g X-Gm-Gg: ASbGncub/X3LKecrzqfz4sQuIHKcxsKCfQPfkM6algS2A6zc03qGiJ+n04mhCHa+6ub ftYIdyXUY7OUIua9s5RjB1Izcl5jFGJUPDw7E/Ha3QbBdrmMMqkRycixLMPO9qnP3TUR2Nn7K4c daxAvHZNoqsXq0Wq55MHzi0Bkbl0erd6x/OL1yJnsML73bjrvMEAVwCfYS5C9hghyrC7/knOyH9 ArpvjFEe+RZJMupDnFJqX+HC/Kyq6G/UOpClgv3RrP1cC1Gst66ltPar4uWwWwtiHmO2omHscnm lp/LGCTlorMLdAI6G7yMfr2SV9Y93Ue41SwJMrO4G8JRR2k= X-Received: by 2002:a05:600c:528c:b0:43c:fffc:786c with SMTP id 5b1f17b1804b1-441c48dc51dmr100765495e9.19.1746542549902; Tue, 06 May 2025 07:42:29 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441b89edfc2sm169603435e9.20.2025.05.06.07.42.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 07:42:29 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 11/32] hw/arm/virt: Remove deprecated virt-2.7 machine Date: Tue, 6 May 2025 15:41:53 +0100 Message-ID: <20250506144214.1221450-12-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250506144214.1221450-1-peter.maydell@linaro.org> References: <20250506144214.1221450-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x335.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé This machine has been supported for a period of more than 6 years. According to our versioned machine support policy (see commit ce80c4fa6ff "docs: document special exception for machine type deprecation & removal") it can now be removed. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth Signed-off-by: Peter Maydell --- hw/arm/virt.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 9d82cf78b0e..a2a213717cc 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3649,16 +3649,3 @@ static void virt_machine_2_8_options(MachineClass *mc) vmc->claim_edge_triggered_timers = true; } DEFINE_VIRT_MACHINE(2, 8) - -static void virt_machine_2_7_options(MachineClass *mc) -{ - VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc)); - - virt_machine_2_8_options(mc); - compat_props_add(mc->compat_props, hw_compat_2_7, hw_compat_2_7_len); - /* ITS was introduced with 2.8 */ - vmc->no_its = true; - /* Stick with 1K pages for migration compatibility */ - mc->minimum_page_bits = 0; -} -DEFINE_VIRT_MACHINE(2, 7) From patchwork Tue May 6 14:41:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 887821 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2588616wrq; Tue, 6 May 2025 07:49:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXqVHfsDVsnXhdSSFicsQ02WyA2SE565V4/c4GyxYny71vdwMAWf/NVq+PU1aHwxwoyVzYI4g==@linaro.org X-Google-Smtp-Source: AGHT+IFJ58CjA3xEvqmrLAtKGSWaRWUIF2vLkZCty262SXWzSfztIJAPKDQQXtZaDoNREnvE3vgH X-Received: by 2002:a05:620a:3949:b0:7c5:49ee:86aa with SMTP id af79cd13be357-7cae3a883fcmr1359300085a.4.1746542943562; Tue, 06 May 2025 07:49:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746542943; cv=none; d=google.com; s=arc-20240605; b=bWX9aMWjTt3bmy7Yz7JGSIdOMGQ5UQ9/NN4mls5H0qcPnJSufGJrE4t5AAnAtlaT5e RwzA9J5NNIi2Fj+lU4OAqlEPmuD8xHURhaFSyqS7GFc/kPAUp8G9P/+PYdhAYrufiv/u LYBmQGrEriYhRqiHUgJe16MudUQ5whu5K6DG/9QswpovSIdYTF298riSaCgH86Obteqc 5xGFJIC+174z/FoJEpVxqCZBUWwaoMTh9IiKqjCqvxxfFIbZ5qzprv8nTxiStkQfTQtY PzRC+lvvQYY12708AJyl15IWJqjVGI9i9T8vhi7keIBlu6aP+oIOAeT0UbYt3aKijE/4 0WQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:to:from :dkim-signature; bh=5E5blIzr/7R8AU6vWnHAs12sKtgyOGDJz11Dz6ogeEY=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=XVkOT0ubFy7IfkuAOyk5CQ1YJM7SfoS8ts/LyzQ8ygLNEGvnndlzJ/K+yNk8pQEQs0 uVAO6XjwRrgOv165bOQVEjGyl3Tcg9yEhHwSyNfbu4O4GrwjRZQFdIEbZbzWlgDYzDUU jLOn8lB5np/882az7Ia5fGLTI+8qApr7YukditINzea6fyvFYAdG1re97xSuR6ifrqds uyajeI1eRr0adNNsZL0CAsstt+T+XfYYRIKORWkgAjgPJdc1T4BLT597OCNe3BJllR9V j8+DwsS/2v4MA7G8/JBB/fpVsCCGX/MUIHntmkXHcVHKHEjsoPobQgDDjssJmx8cFY8z WHhg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=F2dxvdPS; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7cad24369dfsi1206457885a.421.2025.05.06.07.49.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:49:03 -0700 (PDT) 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=F2dxvdPS; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCJX0-0000sh-V1; Tue, 06 May 2025 10:44:27 -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 1uCJVD-0001dR-FM for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:36 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJVA-00027N-C3 for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:35 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-43d2d952eb1so32630825e9.1 for ; Tue, 06 May 2025 07:42:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542551; x=1747147351; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=5E5blIzr/7R8AU6vWnHAs12sKtgyOGDJz11Dz6ogeEY=; b=F2dxvdPS5wuRvUvMG2HeHQJ0I4eXkLVfuxKQa9wjHTasc8aCKTOmpaj4R4A3K/Ktgm 036yRZYhEMIfkn66eZr4D/7UvUOsTsV+kJoOR8n4daQjhSkaM7MppWOBIkL03AhjITUh dKTc7iLULEJTjSMWYXY1Lm7JrgdiW4C3u1pjAFjgRvsNjKIJXlXVoGQox5TWvf4CuHyU 3MUUL2vH5cIQLYMVJ/FlnUpqTdedwPhEcLxPDgGiVW0IAJja31DPZcimvFL4YmamXPpL fBdUfSJbh88RF4Xxgxsk3wBKAjnPjYNiytD2hNqjemHhLsFOJe554w6LH1YShr5i9/z5 W/eQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542551; x=1747147351; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5E5blIzr/7R8AU6vWnHAs12sKtgyOGDJz11Dz6ogeEY=; b=OVbn0Jq0WYGAPTxfB/hVA1mfQzz2XtJBi1da/qcKuBSrFJVVe/C7+6Ip8DE/nuyO8R RQ7gkBb00NVy7ccZXD1B7OTr8yutuOSo2wL7opvE5gGGHUfDt/3AiroKjWs6G2iZW0D3 hGmbD6Ymli7iSy7+75fjXV/spmigY6FdEhSHbPWoBW0OcclRItma85A1pn7orP23CTP5 tfjj9wA2EVrdxEnaug7i8g9sW74dv/ZYNGXUMgPCq0ql/6mgwwgsDm8GhgP5pN1g060m XEvIkSz7vW+Csv/1g9ojhA54+3dRXUH8J0NsfgMVoy7obLpubbNrkolrL5jMzbBG8pIp nADA== X-Gm-Message-State: AOJu0YyS/T0bIfWPd+S1zlEXIflbwmhFEsB1coy12dGauZQvYrhUHR57 mAVLeOhynNSZHHzZvYbYNhqMJH8nH/qJ2Ui7vz/6foPBlgOElcaN7W7mjz7nit+aQ4AOfAWX+bl 2 X-Gm-Gg: ASbGncvVVREx8Ay2XAxonWLtsogMp/laygFCDq0bU2tOfY/z52UspEe8MQD/faLcpWC DYKnpeysnCIe5WTcxLAImwYtvi2mLXv+IXrbfkxzMcPhwuLIjwjLeJwmXRwZDR4bJlkw87UTe5A qCCJGFW1TEVKITxf6FJWYnIS5Q3CWBhbOO2MdqqratqzsQcnd4Y7G+Ni2V+jCDq8RXbgKGK4/Es RxJxnA0Y3ALjXf81IC4b3A7uueyQpDqa/XPBNaPV0w1I5l1bnSgVY+dnzS2lzjGmS7GWPqVj+9i 9S3Pg5UmqP08b2fkRFaReOOh1YvWR05XHsCy9nFVMArXhN8= X-Received: by 2002:a05:600c:3848:b0:43c:f0ae:da7 with SMTP id 5b1f17b1804b1-441d0fbd372mr28379845e9.7.1746542550754; Tue, 06 May 2025 07:42:30 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441b89edfc2sm169603435e9.20.2025.05.06.07.42.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 07:42:30 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 12/32] hw/arm/virt: Remove VirtMachineClass::no_its field Date: Tue, 6 May 2025 15:41:54 +0100 Message-ID: <20250506144214.1221450-13-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250506144214.1221450-1-peter.maydell@linaro.org> References: <20250506144214.1221450-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=peter.maydell@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.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: Philippe Mathieu-Daudé The VirtMachineClass::no_its field was only used by virt-2.7 machine, which got removed. Remove it and simplify virt_instance_init() and virt_acpi_build(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson Signed-off-by: Peter Maydell --- include/hw/arm/virt.h | 1 - hw/arm/virt-acpi-build.c | 5 ++--- hw/arm/virt.c | 16 ++++++---------- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index 5d3b25509ff..463ac09615e 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -117,7 +117,6 @@ typedef enum VirtGICType { struct VirtMachineClass { MachineClass parent; - bool no_its; bool no_tcg_its; bool claim_edge_triggered_timers; bool smbios_old_sys_ver; diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 3ac8f8e1786..1c8b61f9f8a 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -670,7 +670,6 @@ static void build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) { int i; - VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms); const MemMapEntry *memmap = vms->memmap; AcpiTable table = { .sig = "APIC", .rev = 4, .oem_id = vms->oem_id, .oem_table_id = vms->oem_table_id }; @@ -741,7 +740,7 @@ build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) memmap[VIRT_HIGH_GIC_REDIST2].size); } - if (its_class_name() && !vmc->no_its) { + if (its_class_name()) { /* * ACPI spec, Revision 6.0 Errata A * (original 6.0 definition has invalid Length) @@ -973,7 +972,7 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables) vms->oem_table_id); } - if (its_class_name() && !vmc->no_its) { + if (its_class_name()) { acpi_add_table(table_offsets, tables_blob); build_iort(tables_blob, tables->linker, vms); } diff --git a/hw/arm/virt.c b/hw/arm/virt.c index a2a213717cc..9c4efcd8556 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3347,17 +3347,13 @@ static void virt_instance_init(Object *obj) vms->highmem_mmio = true; vms->highmem_redists = true; - if (vmc->no_its) { - vms->its = false; - } else { - /* Default allows ITS instantiation */ - vms->its = true; + /* Default allows ITS instantiation */ + vms->its = true; - if (vmc->no_tcg_its) { - vms->tcg_its = false; - } else { - vms->tcg_its = true; - } + if (vmc->no_tcg_its) { + vms->tcg_its = false; + } else { + vms->tcg_its = true; } /* Default disallows iommu instantiation */ From patchwork Tue May 6 14:41:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 887806 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2587020wrq; Tue, 6 May 2025 07:45:33 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVkPjs9XJTF5ooLo974TEZ6ZOS/Ykj4EoY/HuaC2nXFPN+kg+XT3FkFQfIwFcMUtDNDh0SRgg==@linaro.org X-Google-Smtp-Source: AGHT+IFmbIm7JdgxDn7nYfyMtaMwZKsfqVcgLqRibEZ9VNQUeVgBCrKqQY71gVxWpmyEvLlPB99u X-Received: by 2002:a05:620a:f13:b0:7c5:65fb:fe0e with SMTP id af79cd13be357-7caf110be94mr612951785a.6.1746542733627; Tue, 06 May 2025 07:45:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746542733; cv=none; d=google.com; s=arc-20240605; b=Ot/fEyIrB8XuEEoQbRxI6/2TWE1OvTOP6P0M5kXLOH/L9yJwZtr2R7UA5OHPMy9caC Q15r5oEllka802AdxqrppUDWa7dYWyUs3MvwyENnO01eNUUkHu4e6PqRmyZQyyqW/de5 Xm2PkrIw/sqN3j0sd3yIxFBJLGJj7TE1wvwfGhaTDoTOAHFze+AfGNfvvRXX4q4uchc/ t0CWwSIO6JyNbXuFPW2grN/5oaGn25hQQ7EAl731+GgD4nCyr4dh45i4ONju+WlZ9e+p z0ogbvniH89wuwz7yGs8TPbI3JY7glD2N/Rkyhqe4xPVOd9ZWSoZWDrTyOlUvA4kTD7z WHcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:to:from :dkim-signature; bh=+FSjo3zQJ43AkDQz9GvWQJa1a1nTj6bZg/diWjzRsDs=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=RVDcgGvohQt4dVDlCeHhs+5+FvwtaJ4qR4PmfXhuqOn2gHd9ZcHh2NGzJ9ka/4L4ED ztJPpnVU2ZULZMX+hkVFs3Rxaor/yrddVMD7iH9Iv5eqW812oa083Uu3JKcIGKPUr0K0 2677iTnOOUssRw7zqwMbkBfAdCKv3/lPmeV1viVjYUZSJFSkROGergJ7M4wjuqcWacHC yw65JiYIqvbrw3KwPRXHjyFHZTkq7uEbv+mhnVrSXMp+71LAt6QV5L9sLLauNfHjm3rk yWjKtjONmyEJX//Maj5zQGb6TqGzISPOGXo/OwqjTxsYW+rVGBoPbfFAaGjxGj6nJSxS d9Dg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ai2M75JA; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7cad23c8d67si1212221885a.138.2025.05.06.07.45.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:45:33 -0700 (PDT) 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=Ai2M75JA; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCJX5-0001Lg-Vo; Tue, 06 May 2025 10:44:32 -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 1uCJVD-0001dh-PN for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:36 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJVB-00027e-CA for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:35 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-39c14016868so6745553f8f.1 for ; Tue, 06 May 2025 07:42:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542551; x=1747147351; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=+FSjo3zQJ43AkDQz9GvWQJa1a1nTj6bZg/diWjzRsDs=; b=Ai2M75JAQPmQ1Rw315vxHsu3dTGYWemx9jC2nlSDYVoX026sXq+e2qMn48/KuKMCpH kOLr09IqLx5Ws8dIBazcVNFuYrXu9y0Z5eEtrupXPwAhJhpHM71iSAKMxsYz36zRn9Yi pboPA8FEb65jiVrCZxefRbQSlgzdRYZyyZG46hC+DW9+/ItDPqI5wq9+jQvzOgZnESXB NpwJhDapylKaBqr1OoZ45JbuOmJxg/8F/IgLOLceoJ1ha9u50DwoG3Jg9cda8EH7tlr0 I4NReCkmj7hGZBAC1QCGEpQk9DW0z6OQB6HwkiRQ/1vcLZqZjD/D5SrlqZAVJL2yZbNW 9KpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542551; x=1747147351; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+FSjo3zQJ43AkDQz9GvWQJa1a1nTj6bZg/diWjzRsDs=; b=TTCkOx2yQ5zJXxHOkf00wzSSasxZwrXE1ObjSxUQfKnWGYPDkQY6tzGjmrK6V1olEL jDgZoPelpFqvgOSu83zPQVsID8Od8a9unfY8xlg4SrnVB2M5jrtK8ad7XA/GGvPgcEwI B/b+3MhJ6b0d0p9qd0aBrwtWYbYAETssyBtVa9qbzxWMT+Uf9SscezgHwfW3AC4j2k7r lpBtF0cJtAEBuaA6224IGQ+WrE6lIzIQ+d4O0yyjo7jpF4FL+CAsx36VJkkoz+EIsfgM En1YgjUtj0EEcHdfGn0H+udUPqNr0EiGuSQkHXDJ7qU0qtlZ0JKrTfeRsfeDDvGYoDZ5 0z7Q== X-Gm-Message-State: AOJu0Yz6RBTnBarxkwtsGUULyumAmYFKob87TS39UgkCWb4r/+SDYqne SesABg56B6o+u1p4UH9XhtnKOrOEJOPmjYKp+K2rSE1NoNapYmFVdjo+z1gTmELgLacUviIyOac b X-Gm-Gg: ASbGncuN053OPVV28/8tfAwsJzISbVBrPFN7txY95omuvGET3YfXuuqHqpMrLa4cz+B 4fgI3lr2dVw40eGO4ynqFp9p987cVRp2AuPll3FiNwrgK842sPuAZ/q9Xkmr22KUh3fG52QWo2j j2SR48wj4lPHO1b9zW6ZbTzoYjV4riN5F/uInfmDSlo7aZzOaPGKRtUiUF6H/D2uGDmwtoLWaRe Gp+UaOVz1g/p1IqUQcG3QOdrGa+CZbp9zRqDJGaEQKmBuWU1Ja7s1LJx9bz2q9cGTqH5jZHScsS wtAVg6dphTi5ssKMQZU/MoATk3AaiQ4Mm61051+z3nO0INU= X-Received: by 2002:a05:6000:2507:b0:39c:12ce:6a0 with SMTP id ffacd0b85a97d-3a09fd76353mr9587238f8f.21.1746542551578; Tue, 06 May 2025 07:42:31 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441b89edfc2sm169603435e9.20.2025.05.06.07.42.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 07:42:31 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 13/32] hw/arm/virt: Remove deprecated virt-2.8 machine Date: Tue, 6 May 2025 15:41:55 +0100 Message-ID: <20250506144214.1221450-14-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250506144214.1221450-1-peter.maydell@linaro.org> References: <20250506144214.1221450-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42f.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé This machine has been supported for a period of more than 6 years. According to our versioned machine support policy (see commit ce80c4fa6ff "docs: document special exception for machine type deprecation & removal") it can now be removed. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth Signed-off-by: Peter Maydell --- hw/arm/virt.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 9c4efcd8556..4ef3f043a21 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3632,16 +3632,3 @@ static void virt_machine_2_9_options(MachineClass *mc) compat_props_add(mc->compat_props, hw_compat_2_9, hw_compat_2_9_len); } DEFINE_VIRT_MACHINE(2, 9) - -static void virt_machine_2_8_options(MachineClass *mc) -{ - VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc)); - - virt_machine_2_9_options(mc); - compat_props_add(mc->compat_props, hw_compat_2_8, hw_compat_2_8_len); - /* For 2.8 and earlier we falsely claimed in the DT that - * our timers were edge-triggered, not level-triggered. - */ - vmc->claim_edge_triggered_timers = true; -} -DEFINE_VIRT_MACHINE(2, 8) From patchwork Tue May 6 14:41:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 887818 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2588317wrq; Tue, 6 May 2025 07:48:13 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXUhMMi317efZ5T6LNXnTlVoTujdjBsUNYDLUiUs0WGlJDdELXsQrJFe6uXc3x3Xm5wvENrRQ==@linaro.org X-Google-Smtp-Source: AGHT+IGbMMe+5LyP6CFTBzl3n8DCrikZpfbsw6j/c+O1EaQ24EifGb6bDijGtjByDgnWLGXar3fD X-Received: by 2002:a05:620a:3799:b0:7ca:f04a:8c0d with SMTP id af79cd13be357-7caf04a8c29mr455900885a.24.1746542892942; Tue, 06 May 2025 07:48:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746542892; cv=none; d=google.com; s=arc-20240605; b=cTKjXv2UccdVJAEZXijo5TvaJawJsGrDIvmIOWtaaS2HPn93eKJb/cvBzQUcnKMqLW iivjzScA7DKpjp1SvREqc/zOO+g51kbYA+n9hBJI4voQP2DOolKRt1z1s//9rz6Jg/gS ose3ZnEM9F9CFSz+VSD3poKShUPsj8BlqzTBInVALuLPBTGrqmHoiXn9XviwrrPpL0NV m+RVKBW3ET7InX/Iu62SgFHOgp7zJirED3OOhDx49OyyOd6f1RrlqAuL7Q+i1Mpprd88 Qd1POQ5yIbZVlnZrvo2+F/DYJ4nmkB5fiGsb9hbd4IBlmszkCIT1OtkRB0cI0P7BlQTg Y4Ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:to:from :dkim-signature; bh=1/dIcnRF1J/rEa4WYQBcsfZswkyaBEqJJS3LI+QWLNs=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=bFfq4S18En2XcCfcsFWhkObC7rdJUF274bLmrJmijZuJarH35ePE/sjQXlsreJNeun vrlHBx/EY2Mplge8BjpJmuupLqrajY+mE/ZY7ltAD6tDIrZExLOg5Q+QlIFDRLBwyBH7 lYWmTD/xF8fY2wyUoc48LGy7ZRiu/QibpyF3CJi7gKKcQA8WeyPrI/9nmnAjjK9jmqKG pmLdqadEP+oTwKaZRzL2cgyGNdq6MJCniVLlwRpb3W2lD1CzJhu1VJf2T33Liwv5Y6s8 NOLWtMSUbas4mdnzfzi0XPv0Vc0YUfV2oR0/4A4OHYk16eqa6vejugOdsMzwApGlJYel cBvw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=d19KFUBT; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7cad245580fsi1202031185a.615.2025.05.06.07.48.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:48:12 -0700 (PDT) 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=d19KFUBT; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCJX9-0001sd-Nw; Tue, 06 May 2025 10:44:36 -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 1uCJVF-0001hu-KM for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:39 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJVD-00027x-Er for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:37 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-43d04dc73b7so50015215e9.3 for ; Tue, 06 May 2025 07:42:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542553; x=1747147353; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=1/dIcnRF1J/rEa4WYQBcsfZswkyaBEqJJS3LI+QWLNs=; b=d19KFUBTQ8eMbal94K0tbP/LW5p1zIR1MLHyD+bL2TCnqmtCNwhOmTJyn+QDezuEbT vBlcPkk6To0xjxaVIHFbgHCoIUN9F0DeaQ4p1ID/TH+7N+0r7cy5uUIsmiHF9stl0e6N 8u8CTd4YbsJdiYxll2p6AOXRFlrdzQ3N4gj9fGVb/FfdORGnEFaIeZuk05c/PRR82NAW KejJEjWTjAz9SS2/2lJLWyq4tEnKm6fN3B018GpiHY9rvGyDw7Fp82oHoEaPhlmDC/lI dUeCm4pEPcX3u9wTgXQYqUpHHU7aiY74Hbnj7mUwmGNPmDWIr841qrsjuON/YgLQgNsL DRhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542553; x=1747147353; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1/dIcnRF1J/rEa4WYQBcsfZswkyaBEqJJS3LI+QWLNs=; b=Fek7tUK924CbrPkcGndoT0aFtMIQ8ZeDeWTfMUJ30MP4Q3tJmMs9EEr06SRd+xfa9o Mts5SanCpOfUK9CAfHIwPy7xj4RW4D95hcUiyyvOirROgkrrdsaH/rvZbdTgJIYVVAVP mWDj9Zjrqyl5OeXUQmAyezGWHg+1XiJaSx/tkMcEb7XxiFAGzpKwn74aeHmbqWzUg9GI JtItB8TYQSLWxzI3Ec6RMP5JyI92D8wPnPoCAApfu5yGvbjZkDF7uxBlvVlMFTRkSPe5 9kl62cntjIyIWEXQv/sDgZVi8iRYK8Wo4lfCkT6gAhTLR++US9/8oeMCfpDaO33+JWBH A8Ew== X-Gm-Message-State: AOJu0YxqSIbsEIhaQ4ycUvxCPfvhI+2VRVAKoWisWIPDpJqbX3pJiojM JV3mdPambtScFWk1s3T1586vTgJFcqnJ9C6FtsCb57+1jZGQ/REWrx4k71A0Gjh7kDNnFfYwBI9 e X-Gm-Gg: ASbGncsG0tyhjPPq8l+uGXOH9L9PQBd1UIuPa2XZ6lwXhit2y1CM7I+j0MEW0QxfJCu 869BNirsZlayL2Fbibjx8ECZVDn2Z29MWh0/OY167CeO6Xu2Uh8aojCw+WWoG6jUfJCpo+jm21Z 5xEMGHAyOYifw2zxm4j2zKWbptkvHbEikr4VrOyFtIFIhOxPlL2rhO79DJePQr5sgYAjWSRuTO1 rx8BN0H/UFu+irsVWZhh44exg4pHV0v04IoaRzKO7EW7/VFtEy83rvQl+TS0Q45CQ4f6B1cj7OS tJaRgAL+Nfgm2c96U6av7ydDzYmoUU3eWgt4+B7iFjfW/yrv6atQe9FiBg== X-Received: by 2002:a05:600d:1c:b0:43c:fda5:41e9 with SMTP id 5b1f17b1804b1-441c4933d05mr107317655e9.31.1746542553152; Tue, 06 May 2025 07:42:33 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441b89edfc2sm169603435e9.20.2025.05.06.07.42.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 07:42:31 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 14/32] hw/arm/virt: Remove VirtMachineClass::claim_edge_triggered_timers field Date: Tue, 6 May 2025 15:41:56 +0100 Message-ID: <20250506144214.1221450-15-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250506144214.1221450-1-peter.maydell@linaro.org> References: <20250506144214.1221450-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x329.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé The VirtMachineClass::claim_edge_triggered_timers field was only used by virt-2.8 machine, which got removed. Remove it and simplify fdt_add_timer_nodes() and build_gtdt(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson Signed-off-by: Peter Maydell --- include/hw/arm/virt.h | 1 - hw/arm/virt-acpi-build.c | 5 +---- hw/arm/virt.c | 5 ----- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index 463ac09615e..9c531e28d04 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -118,7 +118,6 @@ typedef enum VirtGICType { struct VirtMachineClass { MachineClass parent; bool no_tcg_its; - bool claim_edge_triggered_timers; bool smbios_old_sys_ver; bool no_highmem_compact; bool no_highmem_ecam; diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 1c8b61f9f8a..7e8e0f0298d 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -537,15 +537,12 @@ build_srat(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) static void build_gtdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) { - VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms); /* * Table 5-117 Flag Definitions * set only "Timer interrupt Mode" and assume "Timer Interrupt * polarity" bit as '0: Interrupt is Active high' */ - uint32_t irqflags = vmc->claim_edge_triggered_timers ? - 1 : /* Interrupt is Edge triggered */ - 0; /* Interrupt is Level triggered */ + const uint32_t irqflags = 0; /* Interrupt is Level triggered */ AcpiTable table = { .sig = "GTDT", .rev = 3, .oem_id = vms->oem_id, .oem_table_id = vms->oem_table_id }; diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 4ef3f043a21..13cbd2275ef 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -370,14 +370,9 @@ static void fdt_add_timer_nodes(const VirtMachineState *vms) * the correct information. */ ARMCPU *armcpu; - VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms); uint32_t irqflags = GIC_FDT_IRQ_FLAGS_LEVEL_HI; MachineState *ms = MACHINE(vms); - if (vmc->claim_edge_triggered_timers) { - irqflags = GIC_FDT_IRQ_FLAGS_EDGE_LO_HI; - } - if (vms->gic_version == VIRT_GIC_VERSION_2) { irqflags = deposit32(irqflags, GIC_FDT_IRQ_PPI_CPU_START, GIC_FDT_IRQ_PPI_CPU_WIDTH, From patchwork Tue May 6 14:41:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 887841 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2590564wrq; Tue, 6 May 2025 07:53:25 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUOWFYXmXZuVq2Txc4wKyZjRhV7EbibSezOusTM+zAgfBe6dQ9kMRSgk1HJz9DhNVoVyx0r0A==@linaro.org X-Google-Smtp-Source: AGHT+IGohBv0sofgP7CgTIo1Vn+bAZ5KUEGu7RNafL//ISNLv5KPmqgN1xCVUrQNl2m2E9jlycQ1 X-Received: by 2002:a05:620a:4310:b0:7c7:a5f5:61be with SMTP id af79cd13be357-7cae3ab2abcmr1559747785a.32.1746543205759; Tue, 06 May 2025 07:53:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746543205; cv=none; d=google.com; s=arc-20240605; b=AZM3cpPxt9mEPvz0dlWuejOfDQ5OLw7RjXTQ7Ft1nsgAAVB+c5qwzab+cdvF2QT6LD 8l5moGImFkXnQMj4RjNb/jJhmzzCcw/Mognl/Zw3MQJ5t1fPWHYoaC9ste8yR7JhhjGy x5yzWBrX18PZZp9qpE6/mCVpAMu7agn+ui+TN4T2eVzYLIok9Uw3KsRDDBlPHbeFbimG ABdeNsGpL5Y1MGY66Uw1ynoav7RemNmLg5jCSt7Kz5PLOC3lvwU3Ni5GGiiBvHUUGGqB iWY6/wY0wUp4+oNtT1TTxNh1MClzeVqpxpHvxAE0xm6Yq7MJuVLErF9zvZggVpgpjIxI L9ZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:to:from :dkim-signature; bh=SqPsRilVNteNXwBemBSBWzj+hYoVzuHn388bnHoTVPQ=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=jvoYjkwP7KGrxwn6j5e+BY6sEPzsQATFEIoJa1hAmPOTk2SIFKQ/IT3AHzOVyd7Chw CSG8EfI8ax1fM1gXHEoQl2DZ2qKakrRL6jSHfjFm9BmeNJ3cLY5ZtRefQjZwA/+tGr3K QgP5UFnvr3xEhR8HNM9LcYybgzsZnCQN5PuD0kEa+TTnelbskFYn+UupuB0C5ScPZ6Jv OV5v3eGCboGN2cZHJ30Etywo5aDBQoqjva9lEQGy+hV7AMV5yPYpTviktGQszVpflhSa jDAjocWkBNGvdJCliTMS3TE0RZ6nnRoY2Tm4D/l7N4MFpcP+fbNy2+SwAwhtBUD01kLX rlDg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Sh636d58; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f50f3ae0b4si118761036d6.48.2025.05.06.07.53.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:53:25 -0700 (PDT) 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=Sh636d58; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCJYO-00073c-TL; Tue, 06 May 2025 10:45:53 -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 1uCJVG-0001iO-Nu for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:40 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJVD-000289-Sv for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:37 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-43cf848528aso43120915e9.2 for ; Tue, 06 May 2025 07:42:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542554; x=1747147354; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=SqPsRilVNteNXwBemBSBWzj+hYoVzuHn388bnHoTVPQ=; b=Sh636d58Iwf+chip0/vWRDdhq3FWyog0A6SmFvyiuynFtUozXSfKYnO2yHNWLgZICT cTN5/sOGmSFSYq6Ly7XERRkWy4t/MecKQJzCM27RztugSdV6mEvA/DnXt4WF4yVo4DOr hxoJJ3le4Zb3OTdW8+syQ41WcQCWomqO1SdWgSWYeIJKnpb8aqTOx6bqSHLFl+XtJOfO g7srmg6Uk5vt3HfxRK+KXrmFOnCv0sNiie6c+b9d64DSPa7/bRRQBK0cH2xU6UONFT0h FnKrUp05xaj4kiDXfl3l0G3JjRvYwwPKIlq4AnziwbvWEnft3HzuKh5arQkJS0qfeK6R 9G1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542554; x=1747147354; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SqPsRilVNteNXwBemBSBWzj+hYoVzuHn388bnHoTVPQ=; b=ECg2mXXVRCYZ6GNOrTArixH1IhhNFCmFUfOwrD+pJceOOhaIJWP1P4g4xTQGEzwDDG nqhw5nDWutp5SEn07v+fqRpB3QYhfv5MOn/fagQmMh53meXh834TEJ1YtUg5wBWngRA6 pdtOe+Vho2Ja9cfGwyqZXvZ2RKaeVICP7AG8FxDnT7p/46KQxc8LyEhtEhjL1T90vtTu nRObMFyUJ24pmxf04SnR32ToFMhdIiju3zRJkrblX32bep+ZmM8SlvIJVrhVzPnv33MW iOVtnsnxTvLNFrHfPCJCsQLyGh/FGEZMjcDTnEsmbqwDJPe1XKNWOMZic/QV+IJukfCN NMkw== X-Gm-Message-State: AOJu0YyduwTRIbcG/v6AF3S+UureKhB2MQb372aolxBBZDLAwtd9IpIJ faBPSx+h8WF2Fq3fxZT+tbBL53UCuPi06NH5y05GYwkeI7hr5ut6qyYjAAxQjD47jSOI1Sn50CB 5 X-Gm-Gg: ASbGncvjwylIHaxvOh0TNljk5gi6FIBamJt+BAm4Y6uzwjwn6rlYwhQ8uTLYYGSuNxr gHm/kf6H/56JPHrz6t0O3L0QJ10iNxoMMQw4moiM+BlLPP5ujarC1/iWgPT2i3Oc31YMiAqvBww WcQ9maI1fRB0kxszUEpR8DiIXwsCM9tiKg5ujjBHLdrahcO8vQ2m7vzFu9gu0gRmMX90JVx9yIT 8p3U4rM151z56XxW1M/5ZERLi+AYXWibDl9gh2y40iOliwOoDWZw6ovteMiYcjsn0ify1vvC7Lo YOBbcopGo8ho4FVDZTXMh1PP1akPTHNcah8HAUn9dJlL0iE= X-Received: by 2002:a05:600c:5105:b0:43c:e7a7:aea0 with SMTP id 5b1f17b1804b1-441d100a80emr30251455e9.26.1746542554054; Tue, 06 May 2025 07:42:34 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441b89edfc2sm169603435e9.20.2025.05.06.07.42.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 07:42:33 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 15/32] hw/arm/virt: Remove deprecated virt-2.9 machine Date: Tue, 6 May 2025 15:41:57 +0100 Message-ID: <20250506144214.1221450-16-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250506144214.1221450-1-peter.maydell@linaro.org> References: <20250506144214.1221450-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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: Philippe Mathieu-Daudé This machine has been supported for a period of more than 6 years. According to our versioned machine support policy (see commit ce80c4fa6ff "docs: document special exception for machine type deprecation & removal") it can now be removed. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth Signed-off-by: Peter Maydell --- hw/arm/virt.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 13cbd2275ef..1c84297fab9 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3620,10 +3620,3 @@ static void virt_machine_2_10_options(MachineClass *mc) mc->ignore_memory_transaction_failures = true; } DEFINE_VIRT_MACHINE(2, 10) - -static void virt_machine_2_9_options(MachineClass *mc) -{ - virt_machine_2_10_options(mc); - compat_props_add(mc->compat_props, hw_compat_2_9, hw_compat_2_9_len); -} -DEFINE_VIRT_MACHINE(2, 9) From patchwork Tue May 6 14:41:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 887834 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2589676wrq; Tue, 6 May 2025 07:51:25 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV9/DsrdJ78/PSll1Lgcc0+NLDXgYAUPeLsl1yt/tNVwCdQDQvk/7mhqiaR70rjCrNQf4AcaQ==@linaro.org X-Google-Smtp-Source: AGHT+IGfUwdqzXVu8YNaBsKqhuO82aZ+P3fRJ335pgpsginJ3H28/VQbIaC2s36svVE/R6dexNtB X-Received: by 2002:a05:620a:2589:b0:7c5:592c:c26 with SMTP id af79cd13be357-7cae3a926ccmr1245714585a.19.1746543084866; Tue, 06 May 2025 07:51:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746543084; cv=none; d=google.com; s=arc-20240605; b=aJZik4NBMtQDQJsoW0NI9kmnEbzHUz4VCAIETa7Irdd/bn+dDaxCA/sLJWCvipSwIA raghuMdXwbQ14VYvhjZz+cjgoSE+G57pRgcAr4y2tf4YxqF7GqDl7BildsHie80oODwT IVm6qZ3YaVlZZvKSY6Knq+oRLt6+heWUrcyS+L1h4dXqDJrHr1OXXGIM73juF81x1wDZ sPVqVzEVK9Ijo37yMdfehjwfbf9sbQ4gKXld828yKZu9wm/6S+9U6MdWaAMVt5rkIN04 KY/JmL2WeIIa6Dx8OHdqKziElVSnAaMA2CXPYmYePF9GQwYur/tQR9OJj1v+W3JKe37T tPew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:to:from :dkim-signature; bh=K63s5sr9Xlf+KqacLl70oGl/JdebL8vSGbHbp6f9PWc=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=ONUoRkhLAsteCuL8EfgQ33Cn+zw2c3o74PcM20Wj+9tu0NnNcUp1iYW8EDybG5f/La gYm2QDePmRqolmo41oPs1kKuAed8IXkSeFG7zk4kM3HTvrCSIIPZlVhBDIEbgxrd5dfg MvsDywANpeX63cDMEDO6WcXclB38Njdro7rMhLs1H4Z/0n8tEzuK2tsvOWZQUP8XWlUA tjEV2fy+eOfYUEd2tFHt5TqXygqO4ibzOqzhp9tSYem3biICNuay5DfIaDDj32wp50bf r583sX4pRpEgs4ROdxXb1reuzuBWocQeLb2xVNuNvdZvAik5T/tYGvmNGBlLvA3EwqG6 6ewA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=bUMACFPr; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7cad2434f78si1142835785a.419.2025.05.06.07.51.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:51:24 -0700 (PDT) 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=bUMACFPr; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCJYa-0007ra-IM; Tue, 06 May 2025 10:46:05 -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 1uCJVH-0001iT-6c for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:40 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJVE-00028X-I8 for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:38 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-43cfa7e7f54so35758345e9.1 for ; Tue, 06 May 2025 07:42:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542555; x=1747147355; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=K63s5sr9Xlf+KqacLl70oGl/JdebL8vSGbHbp6f9PWc=; b=bUMACFPrPutxKovkIOgEol3VHvxgWA5Ts1YOpsfXtNwmOweSv7D0JtKfwYhc97mxnE 9YXrmm+aW/3Gv0lIG1i6l+27wiE4Wzay1+2Y+l1jrrCAVi4hOfW1Smb/FLDY4Ym7pQSQ ah+sH/REB1cDdHgq+CyOWc/GIaobgJBNenxJJs//On/n+mHjn72CQofzidAoAFm25ImV 0fqFG/wOWPMyfrmnCeivmVd/nL7KENmnUBTETDxyK98QuL4TKGQ+pugjDZbnwFtWgUGY iqmIsB3/7olBDH2PHGRfwkfPNgSsZVhEejgZvxm2xIxo6+VwUhOR77U0aS2d4sTvLUMx uB8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542555; x=1747147355; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=K63s5sr9Xlf+KqacLl70oGl/JdebL8vSGbHbp6f9PWc=; b=cBba/7t9ziy3Ohs9m2RdqaBylKQFtbIK0KWaBBu3BwQ+N1gppn1MzE6hGqGhACKPC+ nfSAwFb4aY9qISOaGqK3MSTbEs7t6a0DdOCzM9lwpQ4ovABJaaJdcW4H227C8eLEXi/g r5BgRBKryZ5aXBIoHNa9qarDX5aNtcZ5zubjd0JnpXODkDM33WE7Ojhsx7jeF0MwpFMr 8IDCKGWF974NTeXr8mvhoLgYI7c66/Q5Ei9bmAS/c8xkMXy7w0YETfvwgmUX34XJIdf0 9l+nV8zbBENZ2IcU3rNK/7Nb0yIbsnmxqqV1cB8vrMY7cD4gX51VeYKia8EbdqCF/4N0 UoMA== X-Gm-Message-State: AOJu0YzZEiWOXPJ+Cq5F6uXkgyVDuFVB2kVierFhr3DkH+SqUGbH3cTy 9eAN0bZUUj9gIzUM2yadFHLkN1TIGc3TU5gcoQ1ASattuVlOSLTmhRitmurmtmPuvAazYUB3/+e t X-Gm-Gg: ASbGncu/Zea2qNgTRM2hBHYX2LKuth2b+CzGQreLgTH10YySjEo17Gs+lYrxrwXZ7o3 LT3tDYcWPkhSQfCo+wqbw/Vtdtyq49HEjLLuNxfdegeCrItlje6+jjGBSOANxa8B6GhR1kyztXr ods5VBejstFoA9hY5sJ8M8dDmHCxdQogl+5bXThq7hko4tP4Nu6Ul+QkcdXFqDShNbSssdFFIRP D6o3BH/B8be+MpVphvDN65Iu7LrKz6ytqb/Kr0TtzZbeh3zloA+A0LRcVWAO8POPafYmuWOm0OI d4vEbeUOzbIx09A97wrzpwOeUreqPOQwUMoZ8wnO1T5j2N4= X-Received: by 2002:a05:600c:3b90:b0:43d:1bf6:15e1 with SMTP id 5b1f17b1804b1-441d3a375d9mr389935e9.1.1746542554982; Tue, 06 May 2025 07:42:34 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441b89edfc2sm169603435e9.20.2025.05.06.07.42.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 07:42:34 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 16/32] hw/arm/virt: Remove deprecated virt-2.10 machine Date: Tue, 6 May 2025 15:41:58 +0100 Message-ID: <20250506144214.1221450-17-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250506144214.1221450-1-peter.maydell@linaro.org> References: <20250506144214.1221450-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.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: Philippe Mathieu-Daudé This machine has been supported for a period of more than 6 years. According to our versioned machine support policy (see commit ce80c4fa6ff "docs: document special exception for machine type deprecation & removal") it can now be removed. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth Signed-off-by: Peter Maydell --- hw/arm/virt.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 1c84297fab9..6e10b2b0857 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3611,12 +3611,3 @@ static void virt_machine_2_11_options(MachineClass *mc) vmc->smbios_old_sys_ver = true; } DEFINE_VIRT_MACHINE(2, 11) - -static void virt_machine_2_10_options(MachineClass *mc) -{ - virt_machine_2_11_options(mc); - compat_props_add(mc->compat_props, hw_compat_2_10, hw_compat_2_10_len); - /* before 2.11 we never faulted accesses to bad addresses */ - mc->ignore_memory_transaction_failures = true; -} -DEFINE_VIRT_MACHINE(2, 10) From patchwork Tue May 6 14:41:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 887828 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2589021wrq; Tue, 6 May 2025 07:49:59 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV3bOAXJtrqz2XYw3LeCcsygVCZg6h5Tefr5eHfibgL3kpazHKU6fShYfvF7Qt+A3CVSCHcfQ==@linaro.org X-Google-Smtp-Source: AGHT+IFHLaukR2ebOfcwbvx4n1HDOuVd77LM3icbZ+10wXDbkLZB1nLFg5rEoFqL5/mpscp7jorQ X-Received: by 2002:a05:620a:25d2:b0:7c5:54c9:3b8a with SMTP id af79cd13be357-7cae3ab2017mr1423479985a.26.1746542999219; Tue, 06 May 2025 07:49:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746542999; cv=none; d=google.com; s=arc-20240605; b=ecK5dzR6xINFos5G2uVjuPPJbYnYr9SjOQiE4DAWRdrH6cJUGOtFunTMVGoSvtK2nU ZyNCpMbwgU4EejbMaGAo4UCDvx3T4LcUu0z3baR1gyI1R/+mimbFFBu2Zgr9R4hqJ4qU 58QeL09WlZijqI9bSppgNJXRcg9ZOWplTM1+xRcmitNI8wwK+um7XO/t0lW5VlcdU/9I HzpMVi30CweTlkKia2mWkx6U8+oehbze9iFuRFZDjwVqkQx7pqYk6+ecFTECr8NHYe5e W4GRLRWVrQ0+9DbF/ZvSBmF3fLhDXyv3u8YtviasPCMMQEQUo/EEB+BlmNKGyccfwVKm hstg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:to:from :dkim-signature; bh=tQhWRsmeRZhJEPaGeSywzZPRJRyw52wiAKMOIfW054U=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=NtjcvujxpFllnxLMU5aD2sFokWo0T69wsrhd28koMNf2ei7bHXYk6QhQWrBaN/p6vl G4KCfvco2KqZ6EQ2mNM8hbPb3Pznx1SiSCPeAfOCvtpomRfRSNBuaUbP+WoeTaMTfdem T3qMo14/2rLo3WmVg7/APdYW1Kgz1r09I+mQ/nPOqg8Qbn+GaA+Ap2XedgWyjrX3S/KK pShJ9uD3yJcJ4tEmqJq+dVJltjhPwCQYwt7RO0CB7UJMu0U02/qu882BodXw3r/txRTo JOXSUjqHQQ6wefYTVAPjkA38IsMc8GqnoTm2DDUA35K6TeL6/ebzLZCDsVQunRmlAYkQ rH5A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SheFN0zY; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7cad23ba207si1215872785a.131.2025.05.06.07.49.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:49:59 -0700 (PDT) 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=SheFN0zY; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCJYV-0007Wb-PE; Tue, 06 May 2025 10:46:00 -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 1uCJVH-0001ic-EQ for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:40 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJVF-00028i-Js for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:39 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-43d0c18e84eso25466545e9.3 for ; Tue, 06 May 2025 07:42:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542556; x=1747147356; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=tQhWRsmeRZhJEPaGeSywzZPRJRyw52wiAKMOIfW054U=; b=SheFN0zYy97rk3X6MGdBhz5hoHj/uhx6wvV/9votxJMwdmEcMnKPaI+L6yF5FmNKjp y3f3f9o5WpciAn2GD5GvRmhSVCOQD/3LW9hC0Xt2qUdV1r6KTjfbwM9+2MstwCpBpiDt IDLYtdabysGBfDnpdwi+f8/MPX88Lh78/zMY/U+i+FbxJVRmSskS16hN8M8olknN/vGn APu+gaQwEpxc9W0UQVplXs3I7g0dpjqqdUVbKe2FzR/CNL7RyAyXZXFUHf/12dSXmSdM ibXIGLxgLaZfaDJ0GRK6KxWtnFa7/mTNgYDkRHWkKqYGVoktnKtbShIr+Ep20/3kj4+4 6tMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542556; x=1747147356; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tQhWRsmeRZhJEPaGeSywzZPRJRyw52wiAKMOIfW054U=; b=rK+SE+rJ4uSzd+mlLQfiwAysGtMfDWx7W0WNT1ha0RrAqJwY7X3XtHLud7lT80Sgs3 G3EijdVD9+BbSXa59IfgOUuBdf5+SErwVPkHSQn61CcFvkVy3Eup4peetra2mI4+lQZz DtHaURFvLZZmiOt2DOXfUYnDyfcx2vo2wH/Qq+oYSsenh0bv+tzh4HQ2ZpXJSz+B1wOH k416KTZAGEep8C0W3wjJqJL9SZNlbKewJlnt9DQEaPELq8URqCwbMmOc3DQ1K7dGjhDB BpCmLEsKO9BXof/NtQXaXUfbu6giM4eRS4MX12Nkvs3vpzB0G7Ak40uEvuozdPRlOI5v akIA== X-Gm-Message-State: AOJu0YwKsYPQezUU01JYs8Lqy5UtW6Ic4FmCGvZpYaLEMrpAWEnnygtn rEgZ3mAiqNftmuxJoPhUBaoi0iz2kYEqI2dYWiFOohQDuCZlu3KVOl9q5FFUhFoS6bd60LvrXjt g X-Gm-Gg: ASbGncu0+08J+BpR94wPoDN6MjPGVruQ4mGWfMF9ZGHyCR5Thje0j3ZoRhXtn1SsHUN nNK56KA/6CYM1JJo4rLY4oEaPxiFqMxiRn0pbUQ1wQoohD9eBzWlTNfpWQl9yyd/xKI2yEOS4hN 38RycofnD6nv2TPAp0BfkgFEBUV2HaGMf/wTYMRK3JjG9/UhlK66FeA+Z8ldZ/gqMVGW/7pfpI2 rG/KFtMs9N6f3ReyCPeLO1d6idETUvGjqgSCgrcz3cMnsWWZYy5vueMujvaWm34yuz0nLwGvzFs qo9JRtHvPDR2dhG1e1AoKF6DbkhT1vr8xJ94FcGFBeDCV20= X-Received: by 2002:a05:600c:3e05:b0:43e:bdf7:7975 with SMTP id 5b1f17b1804b1-441c49486cbmr84203585e9.32.1746542555916; Tue, 06 May 2025 07:42:35 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441b89edfc2sm169603435e9.20.2025.05.06.07.42.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 07:42:35 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 17/32] hw/arm/virt: Remove deprecated virt-2.11 machine Date: Tue, 6 May 2025 15:41:59 +0100 Message-ID: <20250506144214.1221450-18-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250506144214.1221450-1-peter.maydell@linaro.org> References: <20250506144214.1221450-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.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: Philippe Mathieu-Daudé This machine has been supported for a period of more than 6 years. According to our versioned machine support policy (see commit ce80c4fa6ff "docs: document special exception for machine type deprecation & removal") it can now be removed. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth Signed-off-by: Peter Maydell --- hw/arm/virt.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 6e10b2b0857..4b21f3226f9 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3601,13 +3601,3 @@ static void virt_machine_2_12_options(MachineClass *mc) mc->max_cpus = 255; } DEFINE_VIRT_MACHINE(2, 12) - -static void virt_machine_2_11_options(MachineClass *mc) -{ - VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc)); - - virt_machine_2_12_options(mc); - compat_props_add(mc->compat_props, hw_compat_2_11, hw_compat_2_11_len); - vmc->smbios_old_sys_ver = true; -} -DEFINE_VIRT_MACHINE(2, 11) From patchwork Tue May 6 14:42:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 887836 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2589814wrq; Tue, 6 May 2025 07:51:45 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV7LmdEDm4VzsuqY/hl7DGPiswH4VWtwN+SAUVrX6IGykbIwgqptNynJSJKwoO1++wIJCUa7g==@linaro.org X-Google-Smtp-Source: AGHT+IG5JkXIg2mlgBJdXWwrnZc9TTiYd1wKZ9zGcwwekyxn+4/gzrxR1QwljC8lni8PGkQPG3Th X-Received: by 2002:a05:622a:22a3:b0:476:b3ae:dcd1 with SMTP id d75a77b69052e-4910c48aefbmr60600571cf.14.1746543105347; Tue, 06 May 2025 07:51:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746543105; cv=none; d=google.com; s=arc-20240605; b=lxeeuNVjMGFyAvNmDXY5YhxzR7befQtJco/lTlBgqSYfKHN5RE92Qq5z0qxk4oSge8 K38/FHKiVlJ32bB7HULp+S2QCUxJNMdW5T07eJdUKvbFVGxcB/zNHzI2zeZkNwUJNQQe fdx4KBp6tosj81ETm9ACiVsL7ceZa+3I3ZPI/BRHamTQjsBDYYJtyjWxjFNLrDDd2rOo 2y4yemRJbwohs8sUcwaVmIZV01ggvoKZZsTF1d0G1HXlpOCKvIZo84uVqAvwD5bQzINe XUbzhrnY+YxG1L9CkdZWCFtuP6XawFmGbHlICcZYwh40zz/a7Q1K9ND8sHv+2Q8PjswZ gGgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:to:from :dkim-signature; bh=A2xms1nxRmqWl4bVsTwmg4X2TDs1x1MpUAQTmcG45wI=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=MiUfR8sc3ZwpeyXQDzILh8HLKlTi0vCbT4g/rcznZlnxwgdMwsLE8/8FpWL11yvLRT AW2vgNCH9/3wudR0eDJ4pJPpu2CDxyn1dg25EMpcIxRLukbXc3b7uCC9bVrKvlGLbfCS UcRTiQietPlVVYA6Tn0v2Qu2mmdGvtTd16t8IybbL97fWUgN0Z6BGzin62OpbrldXmu4 0WQa9p8ceyyIvdOfX5Qux7Uy84tL6qWQheavzEqFi0Hu4Lhzzlgiflj1J4/lDBxi8PxP yx6flmq5iokph75+p+H9P+FCBLwe2kI6PYm2TyCjcobKB63vNKXLNYg3xiLdTaGcb6/Q gVtw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LtISyPsp; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f540138510si3656906d6.292.2025.05.06.07.51.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:51:45 -0700 (PDT) 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=LtISyPsp; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCJX6-0001Wn-7t; Tue, 06 May 2025 10:44:32 -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 1uCJVI-0001nJ-UQ for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:42 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJVG-00028l-GF for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:40 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-43cfa7e7f54so35758605e9.1 for ; Tue, 06 May 2025 07:42:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542556; x=1747147356; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=A2xms1nxRmqWl4bVsTwmg4X2TDs1x1MpUAQTmcG45wI=; b=LtISyPspAnKo+8slG46fu7QdSw9yguIUhchVBLtu64u5/26vn4qpIUNaPU5BDP3wgm HCF9oJMW+Hkb3v7288ECVvS7gKv8Mt6/t0R951WldNk7bW8fzi4vazZWfYP/jbSozzum jjZwm1ezYWv+ef0nbvC5jT8LuhINsZRcla948QqTdYR8dPmAjgzCCekGmY58X0WiTbPA eHcHUHpgeOwgxaF/17SMOuSxLK6tB3g3KoQwOKzyloumMB4TKoFN5tu+/cdr3WQ4xVvW cEFUy4SWGG9FkSwws74ATA0SnIz7506lkRIyyojQzbEaVAVNy5NFzCexF+wT1aSaXMLd v5uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542556; x=1747147356; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=A2xms1nxRmqWl4bVsTwmg4X2TDs1x1MpUAQTmcG45wI=; b=qfBCIKCWh3nldo/lYGQO4/NAsKd3SKdtzGk83mpUYdMMVxZFtOR9jAbX3qPyCGHEF+ 9ybv77lZbZhIfbzlw4ilG/kmKI0x1ItHtr3D40X39yAu0i5kmkyiKzdNZtWmYLbB4rQW t7k0y9uQixMjFHiqerXzbT5bW5WLWjuTJdwxKdBrPTW6amOdrAU3Cqll1zUnB9i18KYr BeOryHNLp8IfXAaDCFSVeDD+P+y4tmw4q2FyvqxwwPnxJRbxzZW8P+126ox/Ap50CyCe S5g64gDVI0oerTuU9wDV1ttl78lBs7xjuR6gVt5/3vSBRtyLxUtdmCQ5rAZ/zS3qgtHW qn6A== X-Gm-Message-State: AOJu0Yx+30Gcoq2fgi3nBCB8USz5bI+MDTU2hqBqdff6BPHhEJOlIz6A ekR7MHCLhJ8E1b5oP4SotUpcgPlT+37XK30ofcQXJo9GR19VDaw3iVkExzOM8DfBqAXl3OF9iGd A X-Gm-Gg: ASbGncugUC28WKJfUzcjmpg51PvGQm5JvaMcALNLWDSxY6n054r3EDQsm2p/TKg9npL LcaOQ0rAfKgbZZ2pDxxw3JUSSGGgoGgggdDaeY+4F0TRscZB9mKeb8WISUyP+7r+hpCOhPDiIZy dzr3tWNtLYMC7qGW0o3lq1bHIlza4d8JXWnHTA+rQgdwRMbf0w3csJn6/+Yz2E2VDuPlTeTRx2V Qqz+YyQHd7PernXo0wNddUV9ej5E97PmqmnEyZ5kWx8mZ9sWC8AKgVIYXTCzp8Bztuait4OpKiH qs/YcZSpofVYl1xTCP24vHOMjofKQ9wtcuCVoSCNBvyuVQY= X-Received: by 2002:a05:600c:1d0f:b0:441:d228:3a07 with SMTP id 5b1f17b1804b1-441d3a78faemr141915e9.13.1746542556698; Tue, 06 May 2025 07:42:36 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441b89edfc2sm169603435e9.20.2025.05.06.07.42.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 07:42:36 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 18/32] hw/arm/virt: Remove VirtMachineClass::smbios_old_sys_ver field Date: Tue, 6 May 2025 15:42:00 +0100 Message-ID: <20250506144214.1221450-19-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250506144214.1221450-1-peter.maydell@linaro.org> References: <20250506144214.1221450-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x334.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.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: Philippe Mathieu-Daudé The VirtMachineClass::smbios_old_sys_ver field was only used by virt-2.11 machine, which got removed. Remove it and simplify virt_build_smbios(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson Signed-off-by: Peter Maydell --- include/hw/arm/virt.h | 1 - hw/arm/virt.c | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index 9c531e28d04..b2cc012a402 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -118,7 +118,6 @@ typedef enum VirtGICType { struct VirtMachineClass { MachineClass parent; bool no_tcg_its; - bool smbios_old_sys_ver; bool no_highmem_compact; bool no_highmem_ecam; bool no_ged; /* Machines < 4.2 have no support for ACPI GED device */ diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 4b21f3226f9..3488bc4fb9d 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1699,7 +1699,6 @@ static void virt_build_smbios(VirtMachineState *vms) { MachineClass *mc = MACHINE_GET_CLASS(vms); MachineState *ms = MACHINE(vms); - VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms); uint8_t *smbios_tables, *smbios_anchor; size_t smbios_tables_len, smbios_anchor_len; struct smbios_phys_mem_area mem_array; @@ -1709,8 +1708,7 @@ static void virt_build_smbios(VirtMachineState *vms) product = "KVM Virtual Machine"; } - smbios_set_defaults("QEMU", product, - vmc->smbios_old_sys_ver ? "1.0" : mc->name); + smbios_set_defaults("QEMU", product, mc->name); /* build the array of physical mem area from base_memmap */ mem_array.address = vms->memmap[VIRT_MEM].base; From patchwork Tue May 6 14:42:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 887837 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2589937wrq; Tue, 6 May 2025 07:52:00 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV1xzdiq6vkraQFCjsGUjpQy24/xq3W9DuVu3C+zO/t5gzycGThp6xyIQmDwgNFxXgTmnU0eA==@linaro.org X-Google-Smtp-Source: AGHT+IEgzcF0kH3M5LvEmC03aurlowf/yJefBs+PrVUKGskNoh+b0nORxmYTcDRiLRy7tjmhN5DS X-Received: by 2002:a05:620a:46a8:b0:7c7:a604:d28e with SMTP id af79cd13be357-7cae3ab2bd8mr1504657285a.33.1746543120144; Tue, 06 May 2025 07:52:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746543120; cv=none; d=google.com; s=arc-20240605; b=XYGUmfVZy6PRS4PVDdRgo2r80ogcyVm0Dj9v6/rPiS5MkhRxSJ/zzYQKRAyt88hSH6 +WZigGttNuhK53V05Fr5uhKZnJr+YsrHO3gIgPcrPeXR4btgppaobnCKpjYui2iMPK18 egrrDW+RqrvnVXphI6xDKwRGzSy4BQhqqL/e3PadHN6OUkWYPQWXJH1JSNsDlaUSyTKU qfqd8NlbDw4TdaCpXk3YDqu9zFSuBNDOWFP14q0XNpHLr55GtYDwEsbeJz2obO1rGB15 S3cHpMmGXspqZr/0iC31ffxMhmtR0Ie8q33lASp7Ohk8TTipnIxVugTziNKp2SG4Pk+P 5Wfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:to:from :dkim-signature; bh=Fp8kUQDpMWonBXU8G2b2uNI95JriAL6PmHOT3keOo+0=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=Ypg28ulHMgIKruEclBduVkUAi5rLOcG4/+DuIC8Tb1tsM/R63K+Adhv3mAOuJvWiIY p2mW7gfR+4UxfFXOvF6cNqULLq2W7ggyjl9XsIpll0o0QNR9b12fIe0pIIBhRnYEOcwm lwLS7fsuXXnsrjj0K4fPZ8vMQ8xFmKmrqM9cOQqZWbGqsu7eERjZY7lsNMWIGIm5UCdY +MfETRJKrkRIFiMOT8M+LUbfL08ZH8AUrJUNbbUYPWMB+I8EVlhIwgWnxjtoqngUmjhV El+yTIjmomVb23TkUnCB0iQtI19Bi+eaF1DOEYhe/GtY7JjxmoVtDg3oEB3/DufTMXaP c3nQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=I9rqKMT9; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7cad244bcc0si1223841485a.590.2025.05.06.07.52.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:52:00 -0700 (PDT) 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=I9rqKMT9; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCJXu-0005oH-LZ; Tue, 06 May 2025 10:45:23 -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 1uCJVJ-0001om-AF for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:42 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJVH-00028x-6h for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:40 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-43cfe63c592so53796535e9.2 for ; Tue, 06 May 2025 07:42:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542557; x=1747147357; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Fp8kUQDpMWonBXU8G2b2uNI95JriAL6PmHOT3keOo+0=; b=I9rqKMT9XomJVv+uWMWc5SB4U+Lvnwrpq/WuebeVkjJqerd735+sRf1KYoHry8GUqq rdIpPUdWVcaF5+NUvj30mN/cOt1GWzLp0RAORXEwbweursPiU3fGtdxOkesa0X3UuBuw 9xMYXA1obgY8NjZMs7zLtnr5Plq7sI87/Ios/krMxkinEzF/4NgjFiHgzf+0JUsIeVP0 oLNbzlwWmRfR8nrb4N7ZqaWg4RKQR4EPoj+oz0DKkRqRW6oZue2dj5fHPgxX2HT3Dys2 pyEP5AfmO2TENEKMjJ2h46fbF+Z+qe5Qz0Vv1FRari66Ccco2jyhvX6hMHHZBtRaBnAm 8i5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542557; x=1747147357; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Fp8kUQDpMWonBXU8G2b2uNI95JriAL6PmHOT3keOo+0=; b=RM1gch0ps/RdLrkI4ujGMeiTcP/B7ZH+f1wqbGDR1RF+uf3lTB91RK96PUS75e9CfK 2TNStOpnhYsNwQMJFVAQAzv8I/n+5yO/j7RTF7xZPjt6sBsEXIkLkmUXOoQH2XsS3o0R ivLSiZ8+V8nx7ls/dpjA3iO2GGPWcf5bZ4zQJhbR11gaUAQlZQlRleEezPVUujHn+zmN pPHvVdUvb1Q1R0LDEsD8Rp7OBJgVq1OtitoEkcMI5AjbZa0NN86pTctr0RF3LcNsYhAn iLrMrWoINH8ca2cDClkTsew2AMEsjOyj/HBs4cr+Xj2P1wwZ9XiksboGhU0As2tU9f9u sU/Q== X-Gm-Message-State: AOJu0Yya0UDBtPOZNvYiT+ik4cKbBxbC8qvba3f8pVDdifLF4HxqJjfi M4NLZzgh05PHpppYLKfVC2aOX/5wW7GIwtmsKBPfp54nP2ufaFK6XkSndcW2CJSStqQaHNUCCY7 I X-Gm-Gg: ASbGncsy9dgYArv1KEjHyVYGUIUerHr+qtE9JDgJ2gdfPyDwLlE3XB6XIY8X/AjLH+/ x7HqGP3LFuSmrU9ss5h34YKCil4g3A44yGQ6bVCW/U/xi0L6XmHjU95g5pdmjTU/bS1pUUWkkfw //ZqJPC7e5s6C5rba7nfGWzztZuQnq6DWNsEi/eduGbPQtR3R7DwaqsrQw8i2exn5H90ie0XTpq WESdiqjq6mEPyj+5ljdzWq5b19SGGx9rcqUMGTZSDldob9SJLRx5nAmVU2edu0G1Tn2SmBMEN6N Yz3WOtvACMKtxzwvTwf1snp4M85x/snXBEZjzOVPZW5rE4tMV2/JWweD+Q== X-Received: by 2002:a05:600c:8283:b0:43c:fe5e:f03b with SMTP id 5b1f17b1804b1-441c49483f8mr115937355e9.30.1746542557520; Tue, 06 May 2025 07:42:37 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441b89edfc2sm169603435e9.20.2025.05.06.07.42.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 07:42:36 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 19/32] hw/arm/virt: Remove deprecated virt-2.12 machine Date: Tue, 6 May 2025 15:42:01 +0100 Message-ID: <20250506144214.1221450-20-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250506144214.1221450-1-peter.maydell@linaro.org> References: <20250506144214.1221450-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x336.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé This machine has been supported for a period of more than 6 years. According to our versioned machine support policy (see commit ce80c4fa6ff "docs: document special exception for machine type deprecation & removal") it can now be removed. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth Signed-off-by: Peter Maydell --- hw/arm/virt.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 3488bc4fb9d..d047983c80e 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3588,14 +3588,3 @@ static void virt_machine_3_0_options(MachineClass *mc) compat_props_add(mc->compat_props, hw_compat_3_0, hw_compat_3_0_len); } DEFINE_VIRT_MACHINE(3, 0) - -static void virt_machine_2_12_options(MachineClass *mc) -{ - VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc)); - - virt_machine_3_0_options(mc); - compat_props_add(mc->compat_props, hw_compat_2_12, hw_compat_2_12_len); - vmc->no_highmem_ecam = true; - mc->max_cpus = 255; -} -DEFINE_VIRT_MACHINE(2, 12) From patchwork Tue May 6 14:42:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 887822 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2588657wrq; Tue, 6 May 2025 07:49:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUUQd7nSIsGIdkiuMIahy1Z0x7ll+z+GOxAgYtk/dtIHzOF125WF6lfccvPmVilMKCQqulmDQ==@linaro.org X-Google-Smtp-Source: AGHT+IEOB5CXTXkYS/EUWoHgpLVacyHbqhi56pDRJR83kFn3E67thtR/F1XiPuEnuFC1XQArUpd7 X-Received: by 2002:a05:620a:3197:b0:7c9:50a6:8595 with SMTP id af79cd13be357-7caf11390fbmr493873485a.28.1746542947897; Tue, 06 May 2025 07:49:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746542947; cv=none; d=google.com; s=arc-20240605; b=GasccREhLXkUXpUbhGTwFFqhinecvHE7hejJ01mTIpGHn+HUQVfyhyLd0RjY7lTnn2 IguqPrllH91HlDerS2f1x3Qo6xkeK90nEY8Z/e/S8chAUcjeSoqXG9HhU/e0CmHq9BLZ 3WRqzP96QX97MFQWkJp+4/Wh+puwLSIN6ACV5aqp8NIUTPVWXgvly7W7bT+TGKOoY9Cy WSjQJNR/7BT8uz6ogy2cqLNIUzptGzihlKLMCdDo2fy+gPN5gj9pPO9zv5VYLHgaJ9Jr o5anPoQfctyJFxQ4XzGXipXTA6ymJMsbaBPAOarfZKDxC19wNnuLmyxxSDEWQKdMJlMW oEPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:to:from :dkim-signature; bh=aiQ7ZcnC+QYDI7GaGe0RXvbyxeI4m0Rk5zu7vlP04q8=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=j52sHHXODI+YDp2WfYBPOi6QQiy4OtIij+AC/nXoOoMkw7jv9HnATcqKZwJy1BsIIm 3j3sL+gAnpb0RzoUDYXLs05eFGVlnA1RQZI3JuFXxOHDxAjTJwPkZWMIlA5q9VpoyPKw sl5RcZi4Jyj/lJtoA3gvzHkFIHbYLJO3qpSUsWoVRezlvd0Fj4KqI+lLxOUscbdWr5pw VD5qHCzpY/TyHqOgu/8SB5fPWnQuOoP7JTiS8ZMmr7/pasWmFgL7w5syW9cMHh92GR+/ Cj1F+jn00oxRFQKGyWLho7ddKPkR9Pjb6LzHypmbbd/ZqeLagNR0sT9IuxBw9t199pFj CZlw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BzgCblww; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7cad23ba035si1116700485a.30.2025.05.06.07.49.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:49:07 -0700 (PDT) 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=BzgCblww; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCJXE-0002EX-9j; Tue, 06 May 2025 10:44:40 -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 1uCJVK-0001sc-BJ for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:43 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJVI-00029E-54 for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:42 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-43ce71582e9so38495585e9.1 for ; Tue, 06 May 2025 07:42:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542558; x=1747147358; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=aiQ7ZcnC+QYDI7GaGe0RXvbyxeI4m0Rk5zu7vlP04q8=; b=BzgCblwwFdTKb8zasqRrcM65zPAqX++X8ILW8O57r8VfLP5rNJGKds0dU6yb8kFqN/ Ncge00MPJak6q3lHw7NDHei1kTe0oNz2OYKoNOq/y4SeJCx73XSibz+22MPMo7GvIOy8 QDZF+a62MQAveLqk7sGo01cfcKAT1JvSCnudEQVBsnSLOopmxIwqwtyqKYRmFUmBvA8m Xg/kgq5oYdRUjfNOe+MnJyE+39I/qzQhfDdBLzhFFdEQ1pKacOmTQMGP397adeJtwF2J TXXmnvlpXUj2LaVx3uXdpdc0myUeHFjKvQZRyAzpdwm5H1t8Z1mhFQWxUbt1pv8kk3FC 7lWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542558; x=1747147358; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aiQ7ZcnC+QYDI7GaGe0RXvbyxeI4m0Rk5zu7vlP04q8=; b=O4Nsz9k1rp02Z4FoPwrrOo7BHEneQ7Zo1RMapiLzs74kxz5kEiy84ehXP2YGxg8aq6 Qw1K57Wfc3j2Cf9DdBM6YuUmciN9KN3jtKfIAIRKC7I2z77U0xzDpdphN7qyUvg14l1T 0oFKBsVM2EGQCDHCguwxRdiqJ13HU3pr8WkTis+M5sf9JPwmNn/t2EetJfZ4+rbZ3ZAV MPlSbxYAbVLl7W0UzyiHz+4jdrk07bWDto1a+d3uRxjoDlSYxL5vCIh8kjXMFyRG9A01 nwIq7HpiNc9qF26YnSsJoAp44LdHszXBLARE7yHyvzTkvsTPuE2QoIw+S/+B2hfdbTkF EG2g== X-Gm-Message-State: AOJu0YwvzL7baH9vRmusXn19Xpu/1ryphfVbt7X1Cn1RdADgWJjs/yve hiJlFGkwpD4DK9WTrTsIHqpISzKDrEncOABGGPrgkYIGuq/fHun5GA1EC4Zo7FCUpPOaKBrckKC g X-Gm-Gg: ASbGncuCdh1cnXupBsAIP/yThshH5T8s/xmJgU2bcw9xUaKmvDp4wiWlRSdr9ieZUoc MENgKgcdVJis9GGQtoekI5mfRtBvPE96Gqk/zu//dKL/CBSSmL8a5o0Q742q8Yx6k48cV4PNaeg DpPU8Cfe8MXM2VXxt34Qx9WVVJBgME5Ybs2751LhidxsHNU7rF5lAna5qIqCK9sonr3K8NDq9Cw km0oJOX/8XK3YIAl/KKnoXRdvEeYh4IOfVkJMWlGiy38vZTVowNzw+XPDCqccQFhdkQrKUMijnV lsihiPmwx6h/BYpAye5Mb+MY2kAql5eFbqSK/5Ko0NbW6Pc= X-Received: by 2002:a05:600c:1d07:b0:43c:fc04:6d48 with SMTP id 5b1f17b1804b1-441c47d393bmr99677685e9.0.1746542558414; Tue, 06 May 2025 07:42:38 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441b89edfc2sm169603435e9.20.2025.05.06.07.42.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 07:42:37 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 20/32] hw/arm/virt: Remove VirtMachineClass::no_highmem_ecam field Date: Tue, 6 May 2025 15:42:02 +0100 Message-ID: <20250506144214.1221450-21-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250506144214.1221450-1-peter.maydell@linaro.org> References: <20250506144214.1221450-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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: Philippe Mathieu-Daudé The VirtMachineClass::no_highmem_ecam field was only used by virt-2.12 machine, which got removed. Remove it and simplify virt_instance_init(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson Signed-off-by: Peter Maydell --- include/hw/arm/virt.h | 1 - hw/arm/virt.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index b2cc012a402..9a1b0f53d21 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -119,7 +119,6 @@ struct VirtMachineClass { MachineClass parent; bool no_tcg_its; bool no_highmem_compact; - bool no_highmem_ecam; bool no_ged; /* Machines < 4.2 have no support for ACPI GED device */ bool kvm_no_adjvtime; bool no_kvm_steal_time; diff --git a/hw/arm/virt.c b/hw/arm/virt.c index d047983c80e..bd1a68673a7 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3336,7 +3336,7 @@ static void virt_instance_init(Object *obj) vms->highmem_compact = !vmc->no_highmem_compact; vms->gic_version = VIRT_GIC_VERSION_NOSEL; - vms->highmem_ecam = !vmc->no_highmem_ecam; + vms->highmem_ecam = true; vms->highmem_mmio = true; vms->highmem_redists = true; From patchwork Tue May 6 14:42:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 887813 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2587910wrq; Tue, 6 May 2025 07:47:16 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU/mG+9/He4XNnOoCFtvk4MjsvdWvnmYhQSTu+p0p01PXUZLTonD1MvHkxnIXP5JqFzA7yTIg==@linaro.org X-Google-Smtp-Source: AGHT+IFmqvsObL/vWyouIutGOSrKn2c3o75Z1MsGM8JExjbx23GaLKjGsyE0eE3GTNyAQz3XQZP+ X-Received: by 2002:a05:620a:f0c:b0:7c5:a31c:6e72 with SMTP id af79cd13be357-7cae39e2172mr1172415885a.0.1746542836650; Tue, 06 May 2025 07:47:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746542836; cv=none; d=google.com; s=arc-20240605; b=aYFqlclpTiSVEKf5LdYJtGVDizlwaIajrTdfxjnJPSFrz/RDWDuOgB9sOHHNb4XbvQ 4nJP4ZgFT4eQOpWEAP93+Niy1z5GJa9G21Ju6Y6rvNN0bUWjTB9LHZdUSTAL0Q9DfgHK le2PVGI97hvgizUwVwrpmHd4hkkkwn5s6XY4Uy/eUKgSf9iyuTsRW5LoQ/HWXsbCR0ld 7ts3GYmmxCjto+67/3bW7mMHQh9PRmFJCh8HqtiyQdcA2g4PaKYOnFyonPQIEuCf59eP Mt9b/tomfOKGDQ39VMbqJ/kokZ9VlkZ3Pqua5ipF0UhlLJgPHJTzVxZlwgz12V0NTD/z JMMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:to:from :dkim-signature; bh=56khE8Uaw81lXGUNJgzYq9SIPvkDB3r1al+lhASF9Ts=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=YHEYIESRnXkEXNu/UgCh/KQfEqgW2/oWcbdweWbSl4AYfepvpayBxc8wtlPRKVengV aByWtcyOeTqGU/GMWClEDM41Qyghu4LOwO56szV3x/4ujQTusRHwND4n7CLvGCbbmL8Y Vkr4U/54pQ2codlSUqyb6a9MZE1mDEKevOz5Hqz1pidi2I7HFaaXTJZbJ98QwHp7HwbJ NKi9XcK8ylvzGGCW+cyFxRiPXo0au6ZCAxMV9YLUC4yR9qIJUvPzFvLREj992XGJcWbT aph+94lx+3v7sc8J2VcAMMlcv9Jht9t9iMJRoeApvoFxnrHfNCMTVgpo23j8CBIM+yBw Rpaw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IpKcNZsO; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7cad243261esi1145859985a.339.2025.05.06.07.47.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:47:16 -0700 (PDT) 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=IpKcNZsO; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCJY9-0006En-Bj; Tue, 06 May 2025 10:45:38 -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 1uCJVM-0001tw-1y for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:45 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJVJ-00029Z-LW for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:43 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-39c0dfad22aso3718440f8f.2 for ; Tue, 06 May 2025 07:42:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542560; x=1747147360; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=56khE8Uaw81lXGUNJgzYq9SIPvkDB3r1al+lhASF9Ts=; b=IpKcNZsOwzMDGNbrSFReIycomj8rLMzLknku1+mPhPpfUtoRCCzCHu6GebUODiU8zQ NHMdKEmAjy2JwSDG139FvjjAKtdFn4I05pRs9mgyDSjuMq1Idyq5eBLvGP7KPe96JPqi +5LjGIdSVsPx3Q857lO0K/oDahr6XMxpUFMY1VbC/8Hi0QSuL/FRuzp2YRl88ybLcYAt uHWAuPGI4ozfXtQmnX7Tozv2V5oxIMaRgpzXGgz6MKDBQj+WrQ98lgfnM+m7cyYc74HZ cnnIVZtm0WIJ7LuPnxj68MboyPcDQJfaWFESLtLmYkk/FgyeOhi22SRDhDiiPNEGcX9A JSLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542560; x=1747147360; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=56khE8Uaw81lXGUNJgzYq9SIPvkDB3r1al+lhASF9Ts=; b=AI1j3LRA8Z0n1ivSvRCwRzoKqsttuu4f2EbWRBARKMozsua+bOmGCiojfZpkJCvYGj 4elJls534qr7tNN1/APnk5C4f97aVD2F7kyFEhma4iXTtsdb3veF0u0EYUtgxPeoHdgX FSOf3ofT8LYzA4RLHNRKoh8XgDPmT+tn0c7fGDHopOmjWXkKLQ2Wp/XPQJnu6q3MDLzE HXwk3T2qo9S/TtKfwuzEt83e4gntO/HWuHhgLdQqlfyatr0eWTXvqWl2CzHKyaLEXYZ3 kB4eO8z9UkkyKuY5lLlvxpVIZG1i+dQ06dDL7e0Ic1VI3l1CtuK3WXcxxIYsF/9/a1ul C5YQ== X-Gm-Message-State: AOJu0YzFbbSpPMrl6oPifaODLovbnMJlOdVav7a6cn15SB18B0B1Y1ns 2TDVLWC3xJkMRxbyC4hiBaZ7frzCE/4Wb+yc1o2GYSZsXlvCQyChbha6lMdYU38sMKMU7W+IEYo X X-Gm-Gg: ASbGncs4kY/cb8Dma9IVCV4zDlKVczZ047qmR63U+APAjyCi3z6BwEwAJFe2mEZhTaF dXdP47Y2/jNT4VHxWkQ5pVA1pv7l6haOgFhsxMRypDwv4rlI2yU8NQJrI54s/KofAhaVvLwlCcN i+9bALe3lnQzVoc4kibbYxG0RjpbJ6A4Hsetx8x6CFuPRDEp8K4j7tYt0SJXV1t5ffXN2VQUEph F/WkRxlGFTNwkzyINd9clYH35BZ1tg0dmyohZINo3GQgGgTFz9gxUC1FwAmzuNQVDGtemOVENJQ gTG0faCgrC+deW2Oe+zH5O6i9amz3pK7D4g+8yvVDuTRFeY= X-Received: by 2002:adf:e30c:0:b0:3a0:9fe1:c298 with SMTP id ffacd0b85a97d-3a09fe1c4aamr6459335f8f.18.1746542560059; Tue, 06 May 2025 07:42:40 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441b89edfc2sm169603435e9.20.2025.05.06.07.42.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 07:42:39 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 21/32] tests/functional: Add test for imx8mp-evk board with USDHC coverage Date: Tue, 6 May 2025 15:42:03 +0100 Message-ID: <20250506144214.1221450-22-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250506144214.1221450-1-peter.maydell@linaro.org> References: <20250506144214.1221450-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.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: Bernhard Beschow Introduce a functional test which boots Debian 12 on the imx8mp-evk board. Since the root filesystem resides on an SD card, the test also verifies the basic operation of the USDHC. Signed-off-by: Bernhard Beschow Reviewed-by: Thomas Huth Message-id: 20250409202630.19667-1-shentey@gmail.com [PMM: added extra blank line as suggested by thuth; set timeout to 240s] Signed-off-by: Peter Maydell --- MAINTAINERS | 1 + tests/functional/meson.build | 2 + tests/functional/test_aarch64_imx8mp_evk.py | 67 +++++++++++++++++++++ 3 files changed, 70 insertions(+) create mode 100755 tests/functional/test_aarch64_imx8mp_evk.py diff --git a/MAINTAINERS b/MAINTAINERS index e748b6375ee..ba702549466 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -843,6 +843,7 @@ F: include/hw/arm/fsl-imx8mp.h F: include/hw/misc/imx8mp_*.h F: include/hw/pci-host/fsl_imx8m_phy.h F: docs/system/arm/imx8mp-evk.rst +F: tests/functional/test_aarch64_imx8mp_evk.py F: tests/qtest/rs5c372-test.c MPS2 / MPS3 diff --git a/tests/functional/meson.build b/tests/functional/meson.build index ab9df03b1f6..52b4706cfe8 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -13,6 +13,7 @@ endif test_timeouts = { 'aarch64_aspeed_ast2700' : 600, 'aarch64_aspeed_ast2700fc' : 600, + 'aarch64_imx8mp_evk' : 240, 'aarch64_raspi4' : 480, 'aarch64_reverse_debug' : 180, 'aarch64_rme_virt' : 1200, @@ -82,6 +83,7 @@ tests_aarch64_system_quick = [ tests_aarch64_system_thorough = [ 'aarch64_aspeed_ast2700', 'aarch64_aspeed_ast2700fc', + 'aarch64_imx8mp_evk', 'aarch64_raspi3', 'aarch64_raspi4', 'aarch64_replay', diff --git a/tests/functional/test_aarch64_imx8mp_evk.py b/tests/functional/test_aarch64_imx8mp_evk.py new file mode 100755 index 00000000000..638bf9e1310 --- /dev/null +++ b/tests/functional/test_aarch64_imx8mp_evk.py @@ -0,0 +1,67 @@ +#!/usr/bin/env python3 +# +# Functional test that boots a Linux kernel and checks the console +# +# SPDX-License-Identifier: GPL-2.0-or-later + +from qemu_test import LinuxKernelTest, Asset + + +class Imx8mpEvkMachine(LinuxKernelTest): + + ASSET_IMAGE = Asset( + ('https://cloud.debian.org/images/cloud/bookworm/20231210-1590/' + 'debian-12-generic-arm64-20231210-1590.tar.xz'), + '7ebf1577b32d5af6204df74b54ca2e4675de9b5a9fa14f3ff70b88eeb7b3b359') + + KERNEL_OFFSET = 0x51000000 + KERNEL_SIZE = 32622528 + INITRD_OFFSET = 0x76000000 + INITRD_SIZE = 30987766 + DTB_OFFSET = 0x64F51000 + DTB_SIZE = 45 * 1024 + + def extract(self, in_path, out_path, offset, size): + try: + with open(in_path, "rb") as source: + source.seek(offset) + data = source.read(size) + with open(out_path, "wb") as target: + target.write(data) + except (IOError, ValueError) as e: + self.log.error(f"Failed to extract {out_path}: {e}") + raise + + def setUp(self): + super().setUp() + + self.image_path = self.scratch_file("disk.raw") + self.kernel_path = self.scratch_file("linux") + self.initrd_path = self.scratch_file("initrd.zstd") + self.dtb_path = self.scratch_file("imx8mp-evk.dtb") + + self.archive_extract(self.ASSET_IMAGE) + self.extract(self.image_path, self.kernel_path, + self.KERNEL_OFFSET, self.KERNEL_SIZE) + self.extract(self.image_path, self.initrd_path, + self.INITRD_OFFSET, self.INITRD_SIZE) + self.extract(self.image_path, self.dtb_path, + self.DTB_OFFSET, self.DTB_SIZE) + + def test_aarch64_imx8mp_evk_usdhc(self): + self.set_machine('imx8mp-evk') + self.vm.set_console(console_index=1) + self.vm.add_args('-m', '2G', + '-smp', '4', + '-kernel', self.kernel_path, + '-initrd', self.initrd_path, + '-dtb', self.dtb_path, + '-append', 'root=/dev/mmcblk2p1', + '-drive', f'file={self.image_path},if=sd,bus=2,' + 'format=raw,id=mmcblk2,snapshot=on') + + self.vm.launch() + self.wait_for_console_pattern('Welcome to ') + +if __name__ == '__main__': + LinuxKernelTest.main() From patchwork Tue May 6 14:42:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 887814 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2588097wrq; Tue, 6 May 2025 07:47:42 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW5knrjzRmNynPudaB4/7GvZdJnitc5Lnmd5m/LTfjha1loOuVS60dIRzjIU7JTqNh3A3sgXQ==@linaro.org X-Google-Smtp-Source: AGHT+IFWaShxozhvfnmSwDuPZ9jy4B27gaGDPDQh52knolx9Vulfv2MBt/Ljx1s/9sw9cJDc1sxI X-Received: by 2002:a05:622a:22a3:b0:476:b3ae:dcd1 with SMTP id d75a77b69052e-4910c48aefbmr60347881cf.14.1746542862375; Tue, 06 May 2025 07:47:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746542862; cv=none; d=google.com; s=arc-20240605; b=htl7TmLkH5fUGxf1a1juYJG65kcUg/GllD05Ad7zHKvN1o7jp3N2r2gABalVVTK6UU R7q4fiy7FTtkFjYJF2npeaF/beFgVXH/GoxZPDlkjAHvvHEDf3/NSQ9mCKvnPwXTOd1e W+Y53sn7CkMxmzitzupNCXZL3QNyPDDMwXCQUc3Fjt7HJrIX32bo9izXPitk94qAoAO1 5vkgJXQr/rVeEZlfO+BMkIHtOpwox58k9PzOXBq79Gurf75gtcN8RhCcN+M/sL76mfaY s5qUoNWkQP3r8pXIec4vWYIUQFobCNDqhFQCGMaqfUYIv3nRQqUplGgDHmDed76sKvUt B0sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:to:from :dkim-signature; bh=Nuq78rkGSNZ7T1CUqO8dmM+8eIROkFYTrjfOysd4f+o=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=akdD9A2bvHYSbnb0QNPt/1AS69m+aGAjN1gC1IgI5KcEDA+hlT/bYgy4/zzWzUHxy4 XMbJDoNRN5LnMD0PX5xoBbTDuCJU1lsf7xSVa4Oq3Lclt7Mlqyu5v1dQN4VGUvPHn/IO ImHx7jEJdebC4Sdh8YKGk56kcphw5t2PNCA7ZQxFhY+UcAF64aRks9Ov+Ruwt0RQIwnq uPOWLux916jQ02X0wU42UhPfsdWMjVCbOYK3MCcP9KJX0nJcBwRgDfxzGQUKWZOwPyZ9 kUuzpIFYxuB7YiY6ob/z8+ozHGNu2L9Ck/eMNJemS37hUdOnuobtHPcuAMjvEC/Guz/t TXIw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="pAG1/HsI"; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-48b9872446esi118211131cf.428.2025.05.06.07.47.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:47:42 -0700 (PDT) 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="pAG1/HsI"; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCJXK-0002eA-1A; Tue, 06 May 2025 10:44:46 -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 1uCJVN-00022x-WD for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:47 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJVL-00029r-Df for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:45 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-441ab63a415so58032935e9.3 for ; Tue, 06 May 2025 07:42:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542561; x=1747147361; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Nuq78rkGSNZ7T1CUqO8dmM+8eIROkFYTrjfOysd4f+o=; b=pAG1/HsItXzUJImiKoaFlGfz1n3PsQZA9GTVg2pQ5tE3sdPIHilVcBqxfmPeJQkJeA Lbvf4q53g6MaB/0f2Usgw0whFYvW0DiNOhmTB3ATgFPbeoj/3MMRd2xP3swYYHbxlXYY NE4Nncf5QDBTxcr4t9VSnhh/KYgMaXNKeEI0318vajeEWb/4niwijfyoiKgWdIB2DIXO QvAejd8Hd3suB0hqTcxtBK0bhK13C1u8RF5leCGCWYa7e/My4jbnj5nWnuhzWyrVQTXI yiuSDO8y1xltPVq2VwmPzDNHdJPCmpO/rRc8kJYUlzxYR49aKf/Y1fLrbZz8WUTJb0lJ q9ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542562; x=1747147362; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Nuq78rkGSNZ7T1CUqO8dmM+8eIROkFYTrjfOysd4f+o=; b=ew3OtjCUuZ7d3blK1a3OE4fb4sTWJB7pgc1UgHoQHcK6iMdIMHiKHluxWetB/LshgJ G0mLIZ3jAoRVjh6qGeqJuCKu2JVKaFBw2PPS7+/wNXzOdPYxHy7yofJTt9MLF/VzMFNT gannOX80CVK161BDHuD2YT8F99QSutaWiZoO2GpIvfKXuga1XACBDYe8wLmWD4RmbanU pB9Vglo84DLWru1PzyOocKjYXQi6AUkZgvkSQGMFZQ1tHrAs84gaka2cYkDn/VFWdVrE leR2gLh5EWEfIQUjclb6IUUUzqEI8TESvwTouSr4OaO1MXDnmOfA+u0q0ToKECjKdCcH JBuw== X-Gm-Message-State: AOJu0YzXuKZAIeTzBXtU8kM+6HpuCJBJsJyaXVazXOPnfGEre8XXFzRV F7BDRhDK0HMlOILbEYWTCDyNpimqABAjxilC+fR3DQutNtNcbizMYOtnqafITKBQ+K0gkBjZiE+ J X-Gm-Gg: ASbGncvP92EvEV4Lyu3SyTohexbVdeb1P1J6jdwUDGaItlUy7Drh3y7il2OhbPNVlJs omFtL+NSy3gJzZ1mjWJcDnmNXjqAyQJFhYtDlijwsyvE+mxPdGFJXTPmt5AgoRDjHocigl6U75i 9OzFWm2KPi3vS30GgDK9HPJ1K2RfJ3TgBKhaD97JNfctsb4Im7m4+BuNNb4AMqBkyqj8i6cR6tv qha0VsGFRVn3UFu4Puwa0GE4N5EIcDywoHW0pT4WErem7+Xzsnpk762z/YAsV/yxnyCEgMQxEtI FohZco/xpYsyJWexTUlj4+dTzcj7qqvn+YihBPzUa9ZF3TQ= X-Received: by 2002:a05:600c:b88:b0:43c:eec7:eab7 with SMTP id 5b1f17b1804b1-441d0fccce6mr26972135e9.11.1746542561630; Tue, 06 May 2025 07:42:41 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441b89edfc2sm169603435e9.20.2025.05.06.07.42.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 07:42:40 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 22/32] hw/arm: Attach PSPI module to NPCM8XX SoC Date: Tue, 6 May 2025 15:42:04 +0100 Message-ID: <20250506144214.1221450-23-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250506144214.1221450-1-peter.maydell@linaro.org> References: <20250506144214.1221450-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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: Tim Lee Nuvoton's PSPI is a general purpose SPI module which enables connections to SPI-based peripheral devices. Attach it to the NPCM8XX. Tested: NPCM8XX PSPI driver probed successfully from dmesg log. Signed-off-by: Tim Lee Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Hao Wu Reviewed-by: Tyrone Ting Message-id: 20250414020629.1867106-1-timlee660101@gmail.com Signed-off-by: Peter Maydell --- include/hw/arm/npcm8xx.h | 2 ++ hw/arm/npcm8xx.c | 11 ++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/include/hw/arm/npcm8xx.h b/include/hw/arm/npcm8xx.h index 9812e6fa7ec..3436abff998 100644 --- a/include/hw/arm/npcm8xx.h +++ b/include/hw/arm/npcm8xx.h @@ -36,6 +36,7 @@ #include "hw/usb/hcd-ehci.h" #include "hw/usb/hcd-ohci.h" #include "target/arm/cpu.h" +#include "hw/ssi/npcm_pspi.h" #define NPCM8XX_MAX_NUM_CPUS (4) @@ -99,6 +100,7 @@ struct NPCM8xxState { OHCISysBusState ohci[2]; NPCM7xxFIUState fiu[3]; NPCM7xxSDHCIState mmc; + NPCMPSPIState pspi; }; struct NPCM8xxClass { diff --git a/hw/arm/npcm8xx.c b/hw/arm/npcm8xx.c index 5cc67b132fc..d7ee306de7a 100644 --- a/hw/arm/npcm8xx.c +++ b/hw/arm/npcm8xx.c @@ -67,6 +67,9 @@ /* SDHCI Modules */ #define NPCM8XX_MMC_BA 0xf0842000 +/* PSPI Modules */ +#define NPCM8XX_PSPI_BA 0xf0201000 + /* Run PLL1 at 1600 MHz */ #define NPCM8XX_PLLCON1_FIXUP_VAL 0x00402101 /* Run the CPU from PLL1 and UART from PLL2 */ @@ -83,6 +86,7 @@ enum NPCM8xxInterrupt { NPCM8XX_PECI_IRQ = 6, NPCM8XX_KCS_HIB_IRQ = 9, NPCM8XX_MMC_IRQ = 26, + NPCM8XX_PSPI_IRQ = 28, NPCM8XX_TIMER0_IRQ = 32, /* Timer Module 0 */ NPCM8XX_TIMER1_IRQ, NPCM8XX_TIMER2_IRQ, @@ -441,6 +445,7 @@ static void npcm8xx_init(Object *obj) } object_initialize_child(obj, "mmc", &s->mmc, TYPE_NPCM7XX_SDHCI); + object_initialize_child(obj, "pspi", &s->pspi, TYPE_NPCM_PSPI); } static void npcm8xx_realize(DeviceState *dev, Error **errp) @@ -705,6 +710,11 @@ static void npcm8xx_realize(DeviceState *dev, Error **errp) sysbus_connect_irq(SYS_BUS_DEVICE(&s->mmc), 0, npcm8xx_irq(s, NPCM8XX_MMC_IRQ)); + /* PSPI */ + sysbus_realize(SYS_BUS_DEVICE(&s->pspi), &error_abort); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->pspi), 0, NPCM8XX_PSPI_BA); + sysbus_connect_irq(SYS_BUS_DEVICE(&s->pspi), 0, + npcm8xx_irq(s, NPCM8XX_PSPI_IRQ)); create_unimplemented_device("npcm8xx.shm", 0xc0001000, 4 * KiB); create_unimplemented_device("npcm8xx.gicextra", 0xdfffa000, 24 * KiB); @@ -720,7 +730,6 @@ static void npcm8xx_realize(DeviceState *dev, Error **errp) create_unimplemented_device("npcm8xx.siox[1]", 0xf0101000, 4 * KiB); create_unimplemented_device("npcm8xx.siox[2]", 0xf0102000, 4 * KiB); create_unimplemented_device("npcm8xx.tmps", 0xf0188000, 4 * KiB); - create_unimplemented_device("npcm8xx.pspi", 0xf0201000, 4 * KiB); create_unimplemented_device("npcm8xx.viru1", 0xf0204000, 4 * KiB); create_unimplemented_device("npcm8xx.viru2", 0xf0205000, 4 * KiB); create_unimplemented_device("npcm8xx.jtm1", 0xf0208000, 4 * KiB); From patchwork Tue May 6 14:42:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 887830 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2589030wrq; Tue, 6 May 2025 07:50:00 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVcmyiEqp8rmDe5alasgn7BXqNaMK6/C8AROGb5dT93F5JoymbysbiVAhUUwbWAsIImXjBX4Q==@linaro.org X-Google-Smtp-Source: AGHT+IFM138fVg4VbjInjyU6roIvKbPgdX0alma4ne9V1QXKhLA0Q/ehjZKtodLATn5tEcR2Vo8h X-Received: by 2002:a05:6214:401:b0:6f4:f621:4e4 with SMTP id 6a1803df08f44-6f5358b71edmr58987566d6.28.1746543000460; Tue, 06 May 2025 07:50:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746543000; cv=none; d=google.com; s=arc-20240605; b=LEouSL4607LuuPJ8NeZWtAJFaFcnsMwwLqbFyWloLiviZ54A+/SDlNyV5PfEdM+khb XZawh7SYfaFViVZYVxlESGw8zs4KpjVjAaXJXUrFNCkOJcMLtIhjEJgW/lsCDDrFSXeb dcXKs2FSnkznCofbeO66KlwZ1z+JtiBTJp01L5AMU5pL/TQ2xqh5jpue9Shn1Q7qalir 01QxuHMG+rZfPDl7zXJAKmQMB2xO2g6FzV3LjqubfAEA2lE0DUSc62WP174EcWOJp17+ ZEEZIzQ4LZBYdNM5KT3ZLgJUyFuZ3kBiNZfQbLQ1bpQ4ExVkVzfAT0VG1WOXXlvlblia OfcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:to:from :dkim-signature; bh=NIaSPaix7r679jzJntYchPOTlZ36RPzqbOenhGw4cwE=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=Ljbghp8pxY7uxhcUtb6/Z6t4rP2N6Rfa7H8iwOpXa37CbmNhcOLZDr2ZQS+xXvVlSy ujX2wQ6bYjcwxEj7I3B8GM9/O690TXVekzdp6mzhvgq/QRmgSnmdQ7eDHhhfv9hpfynz 4j2iOSpC4gGmRdqrED8QYN8cCvgQ7cGcWfjSj38hqaUFR4YXSzlIKDFtrYjLIe4ItK8P bmTQheGn8Zsa5yCBEfNXJQqruDESN+UdSV7yhMyTnEOhS/KkhPOfj+AE4o51NZwEDeIY 8szO2oR/QansXQkihJiwedTb97aBeq1DYywRltrQAWiObw3mGJPriO8heDHOPRmBK3Vd 1RpQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=S7C1oDxx; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-48b98e09779si117648361cf.585.2025.05.06.07.50.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:50:00 -0700 (PDT) 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=S7C1oDxx; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCJXB-0001w3-4L; Tue, 06 May 2025 10:44:37 -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 1uCJVO-00023w-Te for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:48 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJVM-00029x-HE for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:46 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-441c99459e9so19289395e9.3 for ; Tue, 06 May 2025 07:42:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542562; x=1747147362; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=NIaSPaix7r679jzJntYchPOTlZ36RPzqbOenhGw4cwE=; b=S7C1oDxxtr14R+vykgGAmg2HclnVtH2vLyeCE/JR2plr2a6CXlNwr5O9WF/Bv8xnT/ xe6nUUqwCbCeFtLvFBu9tF5yK2CnpvXA+Oj+EFRRHTNSP5pjObL8YtXnTgv12eyh0z0D 8E+SvfsewhQBHQNmRvPnS8vIC23Bh/7IsxZCYy+4RLa5HfBhGD73/+3gvI8MLFk11FtR eJ3PHYAEA/Q4sJEOqsyiZYOKVPvKRyy1MwcqyMJ8oVS3hF80GhehHfLpG1UQk9c0xATF IPwvvI2Our/Qty+hkRpMKV7cYPMoiw0H5owOmRXxXXg/EmQDt3bPVbXOMm075rsR4jyD NOAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542562; x=1747147362; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NIaSPaix7r679jzJntYchPOTlZ36RPzqbOenhGw4cwE=; b=VAUu7DCiDCgNKhEu8ALUAyDLL+wuQngRiZx8Z7m35imRW0h0rS+LZW8h+uSjDw+YGl UueaKZbE04rYkILuhmXUMEB3+BEM2Y3WvHuHexsK2zuCFxlfV/LP5VBcOfugmWcvL4FC HZQFE5MYBtStP6Wbw08mhtVvd181+/cvJMcU6loL3T5gt3uJY8pXyjTsiVbyX1Sfbr9T T/kXKdoPVMr64Hhe/capvgwun+s8MGhhJH3vN6qr6qGD92gUL3nVTvuijDsANly4E+yn 1dN9zlotE3bpYVM/bmh6pQ0qD//qgf8jw5xdRD1jH8J2p4JiHxV5dKyT2AleclCj8pww URDQ== X-Gm-Message-State: AOJu0YyJHZjZcDpnnk9nXv0ACtFkzBjpLPJhdJw5P98LRNN/VpukiFYJ 4wvjBKlZvEf0K5tfTdrJHZNqHtPZwdJYK7+dZ1V8vheHH1d3Ls+YKPVeprHaluf4d1yVB7UIMj6 7 X-Gm-Gg: ASbGnctm2FcHjZGL29tYYASA9VpfRJqu0I9rMwfKoFfTuKHZfv411IMzCDdgjUQK25b kVRpGlwzys7vMhipR9Cxv2G/IS449RpfRCOVQJBEYANkW9QKj64pFV75A+4FQib1nAJCQd3swnB 0Rj12/1+X5S7Py5TmrLVhIiK+9/T1Yr4Mh4a06xsUUvSXwUFPaSQ6ib9DBfCwAanUyDw9tg78hM TPibtiAaDPj9KWeHTBKl6CzKHMgUKXpZq7Y9MjrqYhEp7NROaVc2b7JyNwin8iLFMfgMmYgc9pA yrPCBWJLBiMZR7cN2Q76meX9eIX0WlR8iAC07s+hrVv5aqM= X-Received: by 2002:a05:600c:3155:b0:43b:cb12:ba6d with SMTP id 5b1f17b1804b1-441bbea0d49mr159933705e9.3.1746542562484; Tue, 06 May 2025 07:42:42 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441b89edfc2sm169603435e9.20.2025.05.06.07.42.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 07:42:41 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 23/32] target/arm: Don't assert() for ISB/SB inside IT block Date: Tue, 6 May 2025 15:42:05 +0100 Message-ID: <20250506144214.1221450-24-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250506144214.1221450-1-peter.maydell@linaro.org> References: <20250506144214.1221450-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32a.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org If the guest code has an ISB or SB insn inside an IT block, we generate incorrect code which trips a TCG assertion: qemu-system-arm: ../tcg/tcg-op.c:3343: void tcg_gen_goto_tb(unsigned int): Assertion `(tcg_ctx->goto_tb_issue_mask & (1 << idx)) == 0' failed. This is because we call gen_goto_tb(dc, 1, ...) twice: brcond_i32 ZF,$0x0,ne,$L1 add_i32 pc,pc,$0x4 goto_tb $0x1 exit_tb $0x73d948001b81 set_label $L1 add_i32 pc,pc,$0x4 goto_tb $0x1 exit_tb $0x73d948001b81 Both calls are in arm_tr_tb_stop(), one for the DISAS_NEXT/DISAS_TOO_MANY handling, and one for the dc->condjump condition-failed codepath. The DISAS_NEXT handling doesn't have this problem because arm_post_translate_insn() does the handling of "emit the label for the condition-failed conditional execution" and so arm_tr_tb_stop() doesn't have dc->condjump set. But for DISAS_TOO_MANY we don't do that. Fix the bug by making arm_post_translate_insn() handle the DISAS_TOO_MANY case. This only affects the SB and ISB insns when used in Thumb mode inside an IT block: only these insns specifically set is_jmp to TOO_MANY, and their A32 encodings are unconditional. For the major TOO_MANY case (breaking the TB because it would cross a page boundary) we do that check and set is_jmp to TOO_MANY only after the call to arm_post_translate_insn(); so arm_post_translate_insn() sees is_jmp == DISAS_NEXT, and we emit the correct code for that situation. With this fix we generate the somewhat more sensible set of TCG ops: brcond_i32 ZF,$0x0,ne,$L1 set_label $L1 add_i32 pc,pc,$0x4 goto_tb $0x1 exit_tb $0x7c5434001b81 (NB: the TCG optimizer doesn't optimize out the jump-to-next, but we can't really avoid emitting it because we don't know at the point we're emitting the handling for the condexec check whether this insn is going to happen to be a nop for us or not.) Cc: qemu-stable@nongnu.org Fixes: https://gitlab.com/qemu-project/qemu/-/issues/2942 Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 20250501125544.727038-1-peter.maydell@linaro.org --- target/arm/tcg/translate.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target/arm/tcg/translate.c b/target/arm/tcg/translate.c index 88df9c482ab..e773ab72685 100644 --- a/target/arm/tcg/translate.c +++ b/target/arm/tcg/translate.c @@ -7760,7 +7760,8 @@ static bool arm_check_ss_active(DisasContext *dc) static void arm_post_translate_insn(DisasContext *dc) { - if (dc->condjmp && dc->base.is_jmp == DISAS_NEXT) { + if (dc->condjmp && + (dc->base.is_jmp == DISAS_NEXT || dc->base.is_jmp == DISAS_TOO_MANY)) { if (dc->pc_save != dc->condlabel.pc_save) { gen_update_pc(dc, dc->condlabel.pc_save - dc->pc_save); } From patchwork Tue May 6 14:42:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 887842 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2590663wrq; Tue, 6 May 2025 07:53:42 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXtk53ojrau18wJTMwmFxTfZ3LeMoMc6NweFU48KqlHY9Rgh8OAhfyI9knHF4fx5SeUnMgssw==@linaro.org X-Google-Smtp-Source: AGHT+IGEjx4eE/8vcwl99u2T46/rVZI0TVrobN8oqOs3Tdue7LMDAN5/75TlejXzWtu02fVJfW+G X-Received: by 2002:a05:620a:28c4:b0:7c5:464b:6718 with SMTP id af79cd13be357-7cae3b0579bmr1893158785a.54.1746543222146; Tue, 06 May 2025 07:53:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746543222; cv=none; d=google.com; s=arc-20240605; b=MMkStesIDteF2/NPH002aHqh4Z5BKOHIkf6V6Egp+1neK271Ii+bjuRqAobM4cjKUa TDqXnHcvByK8Pf6kE6V6mY+9USL7e8zabmdZQvaMGHgw9z6L7AURMa4r1nTXnXXiNZvO L+VEcOXH4H5mf8DuS+R5aiI1TYCBbGeLe0EkkLMdOTQL1OiIX4PJtn+xO4S0aJJx4FOr Siln4CeigXsQBgGFbmZx+X1wVH03OL13sjbY1/VErpClame4HNJOmpPPOFXBvYKrPF87 WKwY8akkLxoBQJ3hu7KieECWK7wypGNAdL4unXQBbWtcnNQV+ffEQ1uG4QUypO0qGCRX iMIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:to:from :dkim-signature; bh=pBeKEajXSmAhb7LijWOPketZcw3p7yrO3ri2YB9hhOQ=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=D7z790PhPuQiDLI2NPSKzO5dKi9szeY6svndPsgMwCoW5cBa0Aff+wzXN1Vu3baxiF LqMwayFbVVZfbYfu7dw0qj2HxoE+KIRgVQt/X38uKLnAOXq3d/7o+t66560CvJmgVl3J qaXBxoByyitC9Q+O7CjDwPlcFWaFuh3U15YAH4fUOMaZoDM9vqZGxqHGZX+WDovb1VwJ eGtKDedM5uJcW7CCexq+DVnh5cCd2qjZQ/d1T5V9eYh7+z1KCIi24YYamd/6FaxIdd12 xMCxDq+rTGxXh8iKwX5vmlpXmacDnxqTy2XGv2J218NDM2sDjabP+Yj5J3qEPIuFq1qT IklA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="GlW1+/I8"; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7cad23ba595si1116472685a.28.2025.05.06.07.53.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:53:42 -0700 (PDT) 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="GlW1+/I8"; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCJYN-0006tf-A2; Tue, 06 May 2025 10:45:51 -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 1uCJVQ-00025U-41 for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:49 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJVN-0002AB-N6 for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:47 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-43ede096d73so35084015e9.2 for ; Tue, 06 May 2025 07:42:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542563; x=1747147363; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=pBeKEajXSmAhb7LijWOPketZcw3p7yrO3ri2YB9hhOQ=; b=GlW1+/I8Q9iTpcf/l6GEjro49Ckrl/VCGNrKGrjcs7cpch2B34wQcSHpeus/FPhYgP z80X1ZDE68SMD4g5yRw4FfJYNR0CTeSWGOpt21SQtFXIHWAShWlBP6CGNI2M2Gx7tCMS eilhZno9g5Zn2/oeB3srbcS0yZCIIY0N+hxlb/8AMUga5rsSgdxFmrlAx9MmQaQdZ/Zc CDPGfkrJABLpg/9LiLKesHfg4R8I5B1P4wnz4aLleNjAMj2My+xqAbMUowHgr97TFGH8 tXLGLAQrrlMeVmMlCD9hRiE9itNXggGtWApTqqVMq47Ny2ti5sxcYZSPtPG22BYtQHOQ tixg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542563; x=1747147363; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pBeKEajXSmAhb7LijWOPketZcw3p7yrO3ri2YB9hhOQ=; b=gu4xofRZG6rvce235PwC2b4MqZWhYu1zHLt/XtjFFVYM9T7Pds+DOkHyNyelQ9BWlm W8dt4t7jB2OSI8YOCTUiReA+fIUhmQK7IcdIxiaRo32B9HK7dpXS9MYV1PmoYvr+IP6U TgZxsqPL18nf1di0qm0WMHgO2eY96Ybd1+0iK2PoxQTE4OYJwykmz5CsLFZVAB7nW50n +uGoO7NwMTnoXmli5zOSROJJG4vZFeXlDu89U5a6XHwFGfctWyLXanVuvknOTcyxfUFi jr68Bz6eVpkjF3IHKalF0SgpwSjgoCDK6uBm0wbSg7XI3KUA6iS5Xz1a9yLlLbafrfhY 2bow== X-Gm-Message-State: AOJu0Ywi8Ab6fopgw8XLIRJTjLRjSUuQAIYaOi8Zq/fdQfAUggTBK1fz FZgRZfPhjTjUdfEVtfpDbMoELr3PHEDVHRXMcMNb1KnUyXW5MzKS5mon7t5+b/WghLlE+DlCaij P X-Gm-Gg: ASbGncuyNOJ5JKaZXo69+/ep7Wz8ztFTRcySxxgp8wcDDkz4dNtDqYk3dAYATKIsLsK WH0xrXdRZP7K0lkP9GDdkMjHlo86n2TnHa6v2n77mkPqzY5nVsPgz2UavSPE1cfSFlSO2KG9onY c39uUxkgfQVhuQvprMUau7zBl5ptJ6oOBIw70y3SQbFJfjt8TZVIk/x3ARg6TsV3nSGZp/gkdjX a64aCXdJMICbUS/9IHgCIYZE2a7emX7j97sGE/9qQlaAUgpEltdKkDMvfPCX2WMcVKg63ptR2yO +725BuDCTgEr980obE2nMnI8blxhwC6fpPvUO2kCwyWdPG5TJetOzhE61g== X-Received: by 2002:a05:600c:3c90:b0:43c:f44c:72b7 with SMTP id 5b1f17b1804b1-441c48bdfdamr114573375e9.14.1746542563643; Tue, 06 May 2025 07:42:43 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441b89edfc2sm169603435e9.20.2025.05.06.07.42.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 07:42:42 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 24/32] docs: Don't define duplicate label in qemu-block-drivers.rst.inc Date: Tue, 6 May 2025 15:42:06 +0100 Message-ID: <20250506144214.1221450-25-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250506144214.1221450-1-peter.maydell@linaro.org> References: <20250506144214.1221450-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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 Sphinx requires that labels within documents are unique across the whole manual. This is because the "create a hyperlink" directive specifies only the name of the label, not a filename+label. Some Sphinx versions will warn about duplicate labels, but even if there is no warning there is still an ambiguity and no guarantee that the hyperlink will be created to the right target. For QEMU this is awkward, because we have various .rst.inc fragments which we include into multiple .rst files. If you define a label in the .rst.inc file then it will be a duplicate label. We have mostly worked around this by not putting labels into those .rst.inc files, or by adding "insert a label" functionality into the hxtool extension (see commit 1eeb432a953b0 "doc/sphinx/hxtool.py: add optional label argument to SRST directive"). Unfortunately in commit 7f6314427e78 ("docs/devel: add a codebase section") we accidentally added a duplicate label, because not all Sphinx versions warn about the mistake. In this case the link was only from the developer docs codebase summary, so as the simplest fix for the stable branch, we drop the link entirely. Cc: qemu-stable@nongnu.org Fixes: 1eeb432a953b0 "doc/sphinx/hxtool.py: add optional label argument to SRST directive" Reported-by: Dario Faggioli Signed-off-by: Peter Maydell Acked-by: Eric Blake Reviewed-by: Pierrick Bouvier Message-id: 20250501093126.716667-1-peter.maydell@linaro.org --- docs/devel/codebase.rst | 2 +- docs/system/qemu-block-drivers.rst.inc | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/devel/codebase.rst b/docs/devel/codebase.rst index 40273e7d31e..2a3143787a6 100644 --- a/docs/devel/codebase.rst +++ b/docs/devel/codebase.rst @@ -116,7 +116,7 @@ yet, so sometimes the source code is all you have. * `monitor `_: `Monitor ` implementation (HMP & QMP). * `nbd `_: - QEMU `NBD (Network Block Device) ` server. + QEMU NBD (Network Block Device) server. * `net `_: Network (host) support. * `pc-bios `_: diff --git a/docs/system/qemu-block-drivers.rst.inc b/docs/system/qemu-block-drivers.rst.inc index cfe1acb78ae..384e95ba765 100644 --- a/docs/system/qemu-block-drivers.rst.inc +++ b/docs/system/qemu-block-drivers.rst.inc @@ -500,8 +500,6 @@ What you should *never* do: - expect it to work when loadvm'ing - write to the FAT directory on the host system while accessing it with the guest system -.. _nbd: - NBD access ~~~~~~~~~~ From patchwork Tue May 6 14:42:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 887838 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2590122wrq; Tue, 6 May 2025 07:52:25 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXqqU9TAr5eJlqUjz6xpTJR1U2AGadPf+YWyZ/RVX+z9KO7wlnei2toiQ02Okvol7WRfwA96w==@linaro.org X-Google-Smtp-Source: AGHT+IG0HOJvbqW1ImEbDp8PAt4JVCxRp2Bt3JWZzTqVuXBwvHV4tBjaEDTZAYrQ510CQ8VigQeK X-Received: by 2002:a05:6214:500e:b0:6eb:2878:e1fa with SMTP id 6a1803df08f44-6f535422543mr48857486d6.45.1746543145255; Tue, 06 May 2025 07:52:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746543145; cv=none; d=google.com; s=arc-20240605; b=bQXTKlvm+WWt1wwElrT9UW5yithsNb2i/JPpk2PQ+BOcNLCpQIR0SnY2o0FFM0Ynxg EXUFT7vdg/m6gE+t8B/IvEp8ghMV+h2q6x6hKNKscU3n9IRKtJyDQag6qNVBrs0Si6cl eZvn92opNqr+YTh26rDB0AOpb/gvScYoeo7mTW68S3CNkunA8XpjU12FDsX1dz7Ymjx4 VFQi0EajdzEtfWl1/xJBs52gcBabg/9BN8JLHdayRDPrMxfM3lcsXVwY0iBEPhpV5KOC ZpzInQxqn+DwEgOWErjzwq1LAmhOVVQ1q0PoRANpDokTnpvD0LQg3lvhaU7OewCZbiLg 6wMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:to:from :dkim-signature; bh=aj1LInBRLZfeL0vVJ4DPx0VjONBgyKGAHZpqEc/4nFI=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=Ns1P/3DRCC2fRGG+u374YQm7RcWCzQ6E9O7+XfCNMKDil6BfF2W4I91hQwB2NHEY1U jaYz2MbVN7J6L7MMrG1B7tftaZaq26qS3j/zC97SvIIYbNQwMNTHbpzt8WeuA+gXAsBS fngokUbYepON4MNqKqA5/MkH8iiDOJw2AsAlmMqSwWx5cYpSvkvrPFQ80XgWhhVaqFvB E4ZSZS3WaCxESENs22CqhBOqtZ4gEwo/qzkpZ2F/rJn5HZ3HNTqkqz8SSgbVJ6is07Kk 7GwuHJ13Ja8TSyjWUIqaM7z4CRlsfXZ5GEcM9Iv6BuSllrslB922yQv+ZFOz3hqwBpH1 fjlA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xaGyxGgs; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f541955c1asi180716d6.392.2025.05.06.07.52.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:52:25 -0700 (PDT) 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=xaGyxGgs; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCJXO-00036J-06; Tue, 06 May 2025 10:44:50 -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 1uCJVQ-00025b-BG for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:49 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJVO-0002AI-5W for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:48 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-441d1ed82faso5315785e9.0 for ; Tue, 06 May 2025 07:42:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542564; x=1747147364; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=aj1LInBRLZfeL0vVJ4DPx0VjONBgyKGAHZpqEc/4nFI=; b=xaGyxGgsSYh6BeXkp1Lv3toHDNVbgcc0oZ5XD7crkASP0Btf9QVaOEnUQHK4zs+wEg EPU+yECvD2hfuTMDiOLj3QOmQuZGt7OikSMeW6AluNMlF3fLkK7VOOCDZgD6X1s7Dvb0 USx4YbTByKQbzCSUTH2OXW+tdq0X7fEoMHvkgSvzcwUcrHa4g1eMHC0E/ASPQr/JB/+i on2pjfxTc9JsgpDXp+VsQOxLmkZ7SojLgflui9oQJowgFj01TWPrY+9xnR6deztxiv5k qh+QEzqL0+uy1JwMpJznCcUYckcdZ/l3DoHuBOrVTeuxN3Sychsro3Q09iJBxMkWR0JP 3O5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542564; x=1747147364; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aj1LInBRLZfeL0vVJ4DPx0VjONBgyKGAHZpqEc/4nFI=; b=JAgI/0TQw6Isu7JT3ezLerkwqy/3MhSt/VhRq2GUR3r9fV6xfM9bZdHpICKz2VFrSn Om7k+lzie30/2j/+bKAE5172FlL/Y3hRObRVMR7mtqVIg9nAAoXE+krx39KTmbfzLf57 D1iDgYTA6jEuXZc/e+Yg49FHfqZdAwb2vDuALHW08so5vwKwz3XojDjljqHd7IEq8lwt iEEDs7HYuP/h31uO8Edh1TL5Q/LsKPhHw7qjkEn5ULaY49UVpZSbMmiUinx8os5xoYSN QDywNI8eZXXDloMEBzxZwAy4/jd5OvAxCUYqKGlP/w/vznNF6zpBJBdyRXWGdCV/+Pb2 StyA== X-Gm-Message-State: AOJu0YylG0aUzkMuYsqMEFXVOVv7cwg8YebYXQqtHaLEAdZoWidydlit CCycTSjs3RQJ9c0No0zuCO5sHyP7Qd1AxQZDzdb+3RQP7BIzidNXLy3PzHwu22ePiXwitTlwYP3 s X-Gm-Gg: ASbGncuSuR8+hX1ZwEXMG7egIjNteBvjQAINOU7PEB19HH2wfSQOnlbhVRu9/v+AqTZ ASQDQIzDUlA7CLdg1gxafeZLKSnn8TXDp530gZBn7NUuaukbr5rvVm9lqzW+H5sPG9fVlsgZg0O V80VUlA1mUQYeCAbCIr5CsrmoHOS4vsjmqsv3Db8z23P1x08CVyTVGHwdOXGJ0LAKTKECgTGsGv O1Ihk2lPX7zrVfi1SgLOXs+Iml7okf1t0lOGasxl04WLCxwy2UmtwG5EJXA+2mZfbj71okwFXUB z6hqImpAQG5PxZkT8i6tU5P42cCkB/XNH5qNwCekIenx/6Y= X-Received: by 2002:a05:600c:528c:b0:43c:f3e4:d6f6 with SMTP id 5b1f17b1804b1-441c49473e7mr96300925e9.31.1746542564469; Tue, 06 May 2025 07:42:44 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441b89edfc2sm169603435e9.20.2025.05.06.07.42.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 07:42:43 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 25/32] target/arm/kvm: Drop support for kernels without KVM_ARM_PREFERRED_TARGET Date: Tue, 6 May 2025 15:42:07 +0100 Message-ID: <20250506144214.1221450-26-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250506144214.1221450-1-peter.maydell@linaro.org> References: <20250506144214.1221450-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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 Our KVM code includes backwards compatibility support for ancient kernels which don't support the KVM_ARM_PREFERRED_TARGET ioctl. This ioctl was introduced in kernel commit 42c4e0c77ac91 in September 2013 and is in v3.12, so it's reasonable to assume it's present. (We already dropped support for kernels without KVM_CAP_DEVICE_CTRL, a feature added to the kernel in April 2013, in our commit 84f298ea3e; so there are only about six months' worth of kernels, from v3.9 to v3.11, that we don't already fail to run on and that this commit is dropping handling for.) Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-id: 20250318114222.1018200-1-peter.maydell@linaro.org --- target/arm/kvm_arm.h | 7 +---- target/arm/arm-qmp-cmds.c | 2 +- target/arm/kvm.c | 55 ++++++--------------------------------- 3 files changed, 10 insertions(+), 54 deletions(-) diff --git a/target/arm/kvm_arm.h b/target/arm/kvm_arm.h index 05c3de8cd46..5f17fc2f3d5 100644 --- a/target/arm/kvm_arm.h +++ b/target/arm/kvm_arm.h @@ -97,10 +97,6 @@ void kvm_arm_reset_vcpu(ARMCPU *cpu); #ifdef CONFIG_KVM /** * kvm_arm_create_scratch_host_vcpu: - * @cpus_to_try: array of QEMU_KVM_ARM_TARGET_* values (terminated with - * QEMU_KVM_ARM_TARGET_NONE) to try as fallback if the kernel does not - * know the PREFERRED_TARGET ioctl. Passing NULL is the same as passing - * an empty array. * @fdarray: filled in with kvmfd, vmfd, cpufd file descriptors in that order * @init: filled in with the necessary values for creating a host * vcpu. If NULL is provided, will not init the vCPU (though the cpufd @@ -113,8 +109,7 @@ void kvm_arm_reset_vcpu(ARMCPU *cpu); * Returns: true on success (and fdarray and init are filled in), * false on failure (and fdarray and init are not valid). */ -bool kvm_arm_create_scratch_host_vcpu(const uint32_t *cpus_to_try, - int *fdarray, +bool kvm_arm_create_scratch_host_vcpu(int *fdarray, struct kvm_vcpu_init *init); /** diff --git a/target/arm/arm-qmp-cmds.c b/target/arm/arm-qmp-cmds.c index 883c0a0e8cc..a1a944adb43 100644 --- a/target/arm/arm-qmp-cmds.c +++ b/target/arm/arm-qmp-cmds.c @@ -46,7 +46,7 @@ static inline void gic_cap_kvm_probe(GICCapability *v2, GICCapability *v3) #ifdef CONFIG_KVM int fdarray[3]; - if (!kvm_arm_create_scratch_host_vcpu(NULL, fdarray, NULL)) { + if (!kvm_arm_create_scratch_host_vcpu(fdarray, NULL)) { return; } diff --git a/target/arm/kvm.c b/target/arm/kvm.c index 97de8c7e939..9c62d12b233 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -100,8 +100,7 @@ static int kvm_arm_vcpu_finalize(ARMCPU *cpu, int feature) return kvm_vcpu_ioctl(CPU(cpu), KVM_ARM_VCPU_FINALIZE, &feature); } -bool kvm_arm_create_scratch_host_vcpu(const uint32_t *cpus_to_try, - int *fdarray, +bool kvm_arm_create_scratch_host_vcpu(int *fdarray, struct kvm_vcpu_init *init) { int ret = 0, kvmfd = -1, vmfd = -1, cpufd = -1; @@ -150,40 +149,13 @@ bool kvm_arm_create_scratch_host_vcpu(const uint32_t *cpus_to_try, struct kvm_vcpu_init preferred; ret = ioctl(vmfd, KVM_ARM_PREFERRED_TARGET, &preferred); - if (!ret) { - init->target = preferred.target; + if (ret < 0) { + goto err; } + init->target = preferred.target; } - if (ret >= 0) { - ret = ioctl(cpufd, KVM_ARM_VCPU_INIT, init); - if (ret < 0) { - goto err; - } - } else if (cpus_to_try) { - /* Old kernel which doesn't know about the - * PREFERRED_TARGET ioctl: we know it will only support - * creating one kind of guest CPU which is its preferred - * CPU type. - */ - struct kvm_vcpu_init try; - - while (*cpus_to_try != QEMU_KVM_ARM_TARGET_NONE) { - try.target = *cpus_to_try++; - memcpy(try.features, init->features, sizeof(init->features)); - ret = ioctl(cpufd, KVM_ARM_VCPU_INIT, &try); - if (ret >= 0) { - break; - } - } - if (ret < 0) { - goto err; - } - init->target = try.target; - } else { - /* Treat a NULL cpus_to_try argument the same as an empty - * list, which means we will fail the call since this must - * be an old kernel which doesn't support PREFERRED_TARGET. - */ + ret = ioctl(cpufd, KVM_ARM_VCPU_INIT, init); + if (ret < 0) { goto err; } @@ -259,17 +231,6 @@ static bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) uint64_t features = 0; int err; - /* Old kernels may not know about the PREFERRED_TARGET ioctl: however - * we know these will only support creating one kind of guest CPU, - * which is its preferred CPU type. Fortunately these old kernels - * support only a very limited number of CPUs. - */ - static const uint32_t cpus_to_try[] = { - KVM_ARM_TARGET_AEM_V8, - KVM_ARM_TARGET_FOUNDATION_V8, - KVM_ARM_TARGET_CORTEX_A57, - QEMU_KVM_ARM_TARGET_NONE - }; /* * target = -1 informs kvm_arm_create_scratch_host_vcpu() * to use the preferred target @@ -300,7 +261,7 @@ static bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) features |= 1ULL << ARM_FEATURE_PMU; } - if (!kvm_arm_create_scratch_host_vcpu(cpus_to_try, fdarray, &init)) { + if (!kvm_arm_create_scratch_host_vcpu(fdarray, &init)) { return false; } @@ -1835,7 +1796,7 @@ uint32_t kvm_arm_sve_get_vls(ARMCPU *cpu) probed = true; - if (!kvm_arm_create_scratch_host_vcpu(NULL, fdarray, &init)) { + if (!kvm_arm_create_scratch_host_vcpu(fdarray, &init)) { error_report("failed to create scratch VCPU with SVE enabled"); abort(); } From patchwork Tue May 6 14:42:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 887820 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2588496wrq; Tue, 6 May 2025 07:48:43 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXx5Zr79mZKe+L0U8FQq1ZCRkyouI6gFv9y7aVicSIJ3dYGiBOrRDMK+zjzhYSUTLHVBUFOJg==@linaro.org X-Google-Smtp-Source: AGHT+IHeAMhkZHnytbFBvHV9h1L6UdaAf0otLcmoJEc2ERUUz8F0f5gPCRg18V73aqxnXNY/DHZ5 X-Received: by 2002:a05:622a:5585:b0:479:2509:528a with SMTP id d75a77b69052e-48c32ac7333mr280825491cf.42.1746542923402; Tue, 06 May 2025 07:48:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746542923; cv=none; d=google.com; s=arc-20240605; b=Q7qanwRBtA1fA+1DZ57NK0ZdMYLiWufwOd1oSuL5M7z1NwUR1GiVxAsXgQK+3sA4UB 70RfJkr356EpgmB9XOXYmGOsC6Jawx9HYmLqwEGkQ1ZSZL7+xZPQDaWmBNAJRJB7ipB2 uJHscbDzyh+DUiLuWdBM70vG2MWehuyQxMuoz65lvGdJCtt2K3G45H9z90nVZfYMHKlX NH0ICgRb47FyiFP+VZ7EyMI/3b3wxY9l2yOmdZ1ydy+X67eamTYQBF5fKTbCd7iw5SmZ OakvPf7iAXcHKX87Cnk3/nJkSdz4Eg61jZMxwzCMcDhjPiggT0Is4MdmaIZLbR2HULMG yt6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:to:from :dkim-signature; bh=5dLkOrlPPy6RqMrdEp3suypMzxm+aI7FzNluDE4RITU=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=Ke7c9XS7D8xSnuo93KrcbJLvSDeP296ES1NXi3GJj+la85VeVa1B2KnKsI3jITiIMS BWbUqiRVylYkBtkYWajpv2jGKRhZXV4zGajx8lJ/1/hh0qmKVTHHmGROLKCXaJrYbsHC Ctk3VkxYBAbI9yT6dnCnjjMSEpofCqiFv6e73KOtewWJKtgxdvfQpR/jIQQKML916u8J IhjYsL6XSBBLPdj/baCgGQY0A4eGQkZYRz682LDapSC/vNHaix1ryzGsIpxdgSvUPycc ub34G05C2tz2EvTzrM5hG+7E8OX1xBYkrHB4Mr2WbWiQdRUibFlwUhlSFLvXa6ZbI7RL eUGg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MxK2lRUP; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-48b960cfec4si114049031cf.21.2025.05.06.07.48.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:48:43 -0700 (PDT) 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=MxK2lRUP; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCJXT-0003P3-E6; Tue, 06 May 2025 10:44:56 -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 1uCJVR-00027J-Jq for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:50 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJVP-0002Al-PB for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:49 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-43cfa7e7f54so35759865e9.1 for ; Tue, 06 May 2025 07:42:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542566; x=1747147366; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=5dLkOrlPPy6RqMrdEp3suypMzxm+aI7FzNluDE4RITU=; b=MxK2lRUPSrsV0Nxj/SWnvmyrnLbHHzmObMNj+wo+FEopXoZtZrdb1oiDLrzk2KeysE X7bXfw0gPKoShMY2SDzF+BWk8hUkTgEut64lXQreetdGaVIUUPql+wAp6zIkJs05rCC7 jD61DGhV0Fj65rLUdG9MATbYqwZhiinZVKtBHnU5kglTd4Kk51/ad2p9tmAIi8ADk/5P p2++y/1FCTy+TLVPGq/7tnOoarHOBhrVJEdZcsLKWI8qxaY+Y0h9OiZdGc8g8apjOzaQ dYDU+4mKABdZGzve6Y5p+MxUF8EKRBBrxl7d2UOyBvRy/+3s3NA0HeNGrFzKDMEcZWvi Iq4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542566; x=1747147366; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5dLkOrlPPy6RqMrdEp3suypMzxm+aI7FzNluDE4RITU=; b=lLiMHLmdFyIZ9Xs0lt1OMbkyvGgFoSV3WsOBWvcPmUt5mxSLkvC3o6FauMr1uXhZLv yoXckSde4y+WsYMbf4cbKj1squ3kCrd8DzK7iNYUAmO/FBxo8fVApBdOl3k8wyA/aASY 69S8KnDEjJxPPeUqeX6fflFpAl5WOPlbo1LDaFCjx77rIR34PqH1iahp+3CN7D4PCACe fpoRRMELNgSUfHQbehAxcKJJLqmL5HX44Jr3Ux3COBxEFxPKNJxMjbl/YAVlbzDC5mnr QFA0zUwL1zwGuX82RdEbyx2UY0faxzZmSgRb0BMDiIJ3DGqiSShuJzs08R0t2jFPujfG faiQ== X-Gm-Message-State: AOJu0YzjHBMisTUIywkq2n/FsuYmU1fNMsjAlp6aXwXPhXFsJwjkY+rL HLgnS8BP/BdB2Z7IKNBeMCg1Qy7wTWOnI4OHnw0aVdm9NGQKGzSRHMleaaStdGX64Ye1OQa58YH Z X-Gm-Gg: ASbGncvSk0oO0fwR4VSU9R3EqTXqz0hBlBgmyzJKbbCbeXrfF3tck6nyJLrOx/OvH8w 0UEUFGVgMDRzcGZ+X7EYaWPQ/8zprYp/W6NNGlDzZ0CmRwc4yWnqL0a5+H3zt8Djk8AT9RQnRVX fTfl9o6lCAjayb9vmVPxTLib8fKbLAKEhClDox+aMT1NqS1u+8Bhmr+21bpKPqXaLIhVEhPg7QY XRjuqdlxlwGJApFgodLj4SySHMWZCiKt7afbV4HlHp8rDfbuZBPjK8yJ7m5nYxD9sDD+k7KcH7q cRxR4bENmc3bfgVoZic/k0LHDJoH/e1AQjBdpl9nbxSMw4E= X-Received: by 2002:a05:600c:a10:b0:43b:c6a7:ac60 with SMTP id 5b1f17b1804b1-441d3a6e29dmr204705e9.10.1746542565965; Tue, 06 May 2025 07:42:45 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441b89edfc2sm169603435e9.20.2025.05.06.07.42.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 07:42:44 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 26/32] hw/pci-host/designware: Remove unused include Date: Tue, 6 May 2025 15:42:08 +0100 Message-ID: <20250506144214.1221450-27-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250506144214.1221450-1-peter.maydell@linaro.org> References: <20250506144214.1221450-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x333.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Bernhard Beschow The DEFINE_TYPES() macro doesn't need the qemu/module.h include. Fixes: 13a07eb146c8 ("hw/pci-host/designware: Declare CPU QOM types using DEFINE_TYPES() macro") Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daudé Message-id: 20250501183445.2389-2-shentey@gmail.com Signed-off-by: Peter Maydell --- hw/pci-host/designware.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/pci-host/designware.c b/hw/pci-host/designware.c index 183f838392c..b4bff145794 100644 --- a/hw/pci-host/designware.c +++ b/hw/pci-host/designware.c @@ -20,7 +20,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu/module.h" #include "qemu/log.h" #include "qemu/bitops.h" #include "hw/pci/msi.h" From patchwork Tue May 6 14:42:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 887803 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2586668wrq; Tue, 6 May 2025 07:44:51 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUVnamprtPBtTLTl54ZVvxReYR8T2dPFJlA5LUVcMzh1Wv43iXdeg5T0Wl18F+dA4WYiDTo2Q==@linaro.org X-Google-Smtp-Source: AGHT+IHWjIZLucvtCnCtkJkyLCOBeqm/xydeDSBiMSrYz4mSuRmioDKnNudXyI3f3NVngdHzvarm X-Received: by 2002:a05:620a:7e7:b0:7c9:230f:904a with SMTP id af79cd13be357-7caf6d03266mr6484485a.14.1746542691735; Tue, 06 May 2025 07:44:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746542691; cv=none; d=google.com; s=arc-20240605; b=VZJkbRKcMMFXK/vbLX087MiMNSt0HRre6mAa4JycwoPYldXYM17OYeoDxjALtS28rV 2luZrzayK4lpKOe4Ctuj0aQ97jSX3vjZ7pKC2dDuS1lZ5BhExp4KvEzkpF5XzWuMfhWi kBCt1FAQePyL34cw4B6e1Rjxf+FvTamuX1BBw8aJl1WJUdfZdZqJEZ9KJ4ePLOIfx1/p YYqxMf3UGxXaN16Hpicn7pBtHCCp7u1stELxICS94H3VM+tprnaFRgaHyUHhJkmSfmMI D0dPfLGkdAlrKaSFpJs97O5XrLmpB4JKSZsfp+CgusmrOOVb0ddpVg/G25ZPDVLkWKLe L/Nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:to:from :dkim-signature; bh=C/arDs4a2PREB5GkJNcLf5nVqZ2+fR+wYKKH36Jhrbk=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=VroQxsTh44WHVqr3DwxDNg+wKxwjUEbRUzBQZktLe7ZqHKyp4OMDZTdnPPDEXONGC5 Tk4ph0HeAgi7wU5sBPl6BZmL2OYYwiIr5VYR2ZolC2qnFc3eVty3MMVgBaOPNh8rzEKo Se0CX+ldWlXsrRg2kuhVA2PObdyo6KNTNV4HltI5A/+k93QsNbEwBU0w/L6EXAr2XvBG WiHPeBNNksEP51xYeJR22V2hsEaMOW6YGBFBqZmzE6GaNlK8OTw9bpyl0LaI/M6knYmZ xQjAaZZ5+02ifqwWyc5Q/OzAwda/NVTg8tuHqFDEADbl43kwFzpfaWsf9D28GGFoJ7Ym Ngzg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=eN7OGZq9; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7cad2447de5si1099732885a.558.2025.05.06.07.44.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:44:51 -0700 (PDT) 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=eN7OGZq9; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCJXG-0002MZ-27; Tue, 06 May 2025 10:44:42 -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 1uCJVS-000298-Kd for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:53 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJVQ-0002At-Ua for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:50 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-43cfe63c592so53798355e9.2 for ; Tue, 06 May 2025 07:42:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542567; x=1747147367; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=C/arDs4a2PREB5GkJNcLf5nVqZ2+fR+wYKKH36Jhrbk=; b=eN7OGZq9kOeugwquBNackTCb7sC51ryGE2xlYIceA3kV2427mOJmLJHkcSVEMLcg9W fYixywBuStqMnK8aYY/6YsqlVIIMtCKZqknOe1nFAHlnJU17va/Oc9g17YJpNwCLA5er OAe6PakUDYaTA+ykbmJ4sCrsdw7X5CGoZhr7EsohPtefd/4Gcnj22Wc6ClpbZfjPuFUy bjSIusrWnw00kFRxP764zCh2iWmrEoarwEVEzU3sMGeVEwF4Gh304Gtn9AUxIcezSOaJ D0bz7mRUqbMQFLm5Y984kKW466FqshIUaDRmJe5DHWIJk5dZUUGdTzxS75uCQqJZhckv tNkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542567; x=1747147367; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=C/arDs4a2PREB5GkJNcLf5nVqZ2+fR+wYKKH36Jhrbk=; b=GCg9iIaxZXyX/01Nzo/E1LMgF+QNV64ipbmg/tclkyBKn2Fou3fhcs+AD/B87mW2eH jvWJ1ei1f1bOBxirTSKEAeByZD8On6qcyYB6gPaAOVsPY+U2Yf+NRyk/N2Ql0waVjGlY EQAU2a6sVOiZPPpONR9LaalW3PhTaBaajp5rPWcDSKHUxpmUHIZtbnEQ5PX2mzQKazFe uj2fUNYf3BvhMjLaKtpWpXKCJeJKQHuqzSmS/sCh1Ldt2/YPCRldydiE4TPsfYiUwbgy AM/UDyv5XLIbKvUbAFs32DSwncYStj8U0QSO70honNA7ElY0eVgN/nV0zAxTv3NkeP0B cOAA== X-Gm-Message-State: AOJu0YxjvaFsmnWojY7hL+d84KEI2ZXPBJ/NhaDo4J7uuviJYatkoaBV y26hgOViAQygo4y3MZabld2/SDSa1Hpd4APG8LnESeY10uGJghC95YTU+Yv+1c+zHKkMBShyw0z r X-Gm-Gg: ASbGnct7ea99o1X1+C70ZLQyAUjpxrLNa9oUIUo9Tg+W2uXuX+sh0LmXDmqmwTCqHXz 4KBmg3ltDb9axlknHVBydU/zxSEMeZSe5AvMVHm+cxws4YNCHt3SEwpte8Y2fKfo2dBYjWrCk+g vOuvKKw8UaxywBQjzMRIXHNIQbnK6Vei9Bc9ZvPCLncVcbpmv1kcYe+8p+SDkZ8gn/ex+srVV1B dR060qq8W6yuCNkue5kO6wgfA0B5ouWbTdYlm/IuU4vUEBcIL/OrX4w41SjBhgMFkoEgdWLJ0Em lClb0R5U2vYFgUwoMIfWizwuhzXDWOPuZH0j5esJy9IvDGM= X-Received: by 2002:a05:600c:5285:b0:43c:fcbc:9680 with SMTP id 5b1f17b1804b1-441c492376emr88401725e9.25.1746542566842; Tue, 06 May 2025 07:42:46 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441b89edfc2sm169603435e9.20.2025.05.06.07.42.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 07:42:46 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 27/32] hw/pci-host/designware: Fix viewport configuration Date: Tue, 6 May 2025 15:42:09 +0100 Message-ID: <20250506144214.1221450-28-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250506144214.1221450-1-peter.maydell@linaro.org> References: <20250506144214.1221450-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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: Bernhard Beschow Commit 6970f91ac781, "hw/pci-host/designware: Use deposit/extract API" accidentally introduced a copy-and-paste error, causing Linux 6.14 to hang when initializing the PCIe bridge on the imx8mp-evk machine. This fix corrects the error. Fixes: 6970f91ac781 ("hw/pci-host/designware: Use deposit/extract API") Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daudé Message-id: 20250501183445.2389-3-shentey@gmail.com Signed-off-by: Peter Maydell --- hw/pci-host/designware.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/pci-host/designware.c b/hw/pci-host/designware.c index b4bff145794..f6e49ce9b8d 100644 --- a/hw/pci-host/designware.c +++ b/hw/pci-host/designware.c @@ -348,14 +348,14 @@ static void designware_pcie_root_config_write(PCIDevice *d, uint32_t address, case DESIGNWARE_PCIE_ATU_LOWER_BASE: case DESIGNWARE_PCIE_ATU_UPPER_BASE: - viewport->base = deposit64(root->msi.base, + viewport->base = deposit64(viewport->base, address == DESIGNWARE_PCIE_ATU_LOWER_BASE ? 0 : 32, 32, val); break; case DESIGNWARE_PCIE_ATU_LOWER_TARGET: case DESIGNWARE_PCIE_ATU_UPPER_TARGET: - viewport->target = deposit64(root->msi.base, + viewport->target = deposit64(viewport->target, address == DESIGNWARE_PCIE_ATU_LOWER_TARGET ? 0 : 32, 32, val); break; From patchwork Tue May 6 14:42:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 887809 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2587695wrq; Tue, 6 May 2025 07:46:52 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWooRGi6NbJ6H6ohNAjkV/5x6Pwd/JVHPkkrISBK0wI0BFK1kY9ifZThRuGjTHlIixiSR9b3A==@linaro.org X-Google-Smtp-Source: AGHT+IGO5F9hxVmOJac2DQMSNA3zZDBLHnoBJ5c4NsVrdyncl9Kpf9+MM/Xho+L3fVIlCvnF8I+u X-Received: by 2002:a05:6214:2625:b0:6e8:903c:6e5b with SMTP id 6a1803df08f44-6f541883334mr638786d6.9.1746542812026; Tue, 06 May 2025 07:46:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746542812; cv=none; d=google.com; s=arc-20240605; b=ha5SJNI2a2puuPwo2aib4k8aaUmj/1hyp0DLDqRYuyiYPkRz6Fv4LPPQb8pvBLNQb6 +ib/rZ+ebQI6G8eP0rWvglr9tb6rSAx7jrw87xEg3BHH3V4Bgh3RtnhaSIE0vKXfDqTC HK1s0JtTzkelh84vHRod6RgiNmPM7LsB5tGc9pdv4sFq8KVLSlfA06Kfw/uqfIOHLB67 G+oSjaDPHZ8C56DzoUiR0M6RHtGVSrnNERwq35N3+1Vp3IcCDkpqvpOhsWf4kg/pZdul 9eOeW6g16GLMLw+bOtPvbnX3KzIRB5LFk1arXs04Oetd0beCD81UvaJ2JJmyjCf+Ggb9 9E8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:to:from :dkim-signature; bh=i+QMorwpUEytgCmmdGbZfkGf25KtJrpacfldZ2jwkgI=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=WhUVX2eQVcpHTFxzLHZ4Idmd2DGNTYt3KWB2NzGhUWT/pAYLvSgMB2GdjiQRtD6qB+ VloCi1f8IwdSHwmAQHlMHjalaPt68BvTvZlT4CGyD8FKx40fIo4Px0tBb+gh/x58VJKg jFVl1W0Cj9JtV5fiI0uQg3zWXdpXWn22UoNCwsWPj06X7nTOOGKjEBnSq/qneWFoUwOe oM42kXsT4+nubYxahCHGLyLe8183Uu1potfBiNFXbBvLlOXmFoau6cI9bBs83ar2w8vB LCE6GNCRMOcrJJmyu+EBApthDeRR01nXqBXyTSLBI7D8/dfH6/G4uBob7gWHtJe8x401 lxEg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=va3hfedo; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6f540183407si3619106d6.508.2025.05.06.07.46.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:46:52 -0700 (PDT) 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=va3hfedo; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCJXK-0002g8-Bb; Tue, 06 May 2025 10:44:47 -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 1uCJVT-00029G-Ga for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:53 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJVR-0002BK-Qo for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:51 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-441d1ed827cso4608615e9.1 for ; Tue, 06 May 2025 07:42:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542568; x=1747147368; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=i+QMorwpUEytgCmmdGbZfkGf25KtJrpacfldZ2jwkgI=; b=va3hfedojbGZEG55KkKPi6X86tpfKHn8xSd1NJ1Vm+iWe0lb7rgFy1Q06vYjKcrhM7 pnPTPs7QyQ4DPujkXvW//ngOpTzX015Q7DQrF7AgKEgp7dugNZWjw1Rll/qUQLFCV2id 8RdUWTHxa4+55k7O8PqCYYsP8iQPOMBIvbfZUQfDd6oBr875bcd1GnrvO7A4PWk7WhoP ue3JDW0ZDLpXwDjhLIJri7HAvsPo2ygaAo8P5sl+WexUdiRv/f7PTa7eWCLlGNk0Lgli 62HmC/qO/1XHJOXljuDtYbU0NsqOhFMz1e4SYDswtqGiWCzDaGSkyldE5JGIpHohJvhz SY6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542568; x=1747147368; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=i+QMorwpUEytgCmmdGbZfkGf25KtJrpacfldZ2jwkgI=; b=M0geBT1+ElFyuaqxNDdBs0r5z6rZbul8HUC2xYHapuup94YtPZW0TVhOi3dsULUF5k dLM56cXkKE10rssrcKy/biGaOrQmgI58tB3mj+rBH1DzOQItGqnnyuyCbi8h5iowkdoC UtdU2uSoRK6wDJN5k0LArFD6K9DECaSNh9rftl+b2JIOFvGcyveqfn6gcNOp5LSJw2Wu pookqx+Jdo/EeBXthH90CBV8Iq+WB0zh/wZF98e2Z24aSLD7N3vcuUL9U0BGdlTExPYD TL4ICDF2g75/rrqtt5lMi0k+6bx+X/sx0EmvgrfvsoVlKaPn6ViARt4K19LB6Bv0Zjur +cvA== X-Gm-Message-State: AOJu0YyB6uXBt/IW7NTfur99DolRLwIEOLkx6xGNalm7Ggcqh8Khft7E LDjifx0K1eh63MEnZPW9sdxSiqKWN35k6ehXMrJhNpY7BD2+8oYBT5fDIXUGwCyNWA8MhKYoc40 A X-Gm-Gg: ASbGncvKCuZRQfGV2Dx5SBXkbeGJqDrNIjPnduS9vjKVRCJ61T+P+yO21hwkP+3rY/A Pfm801TiW5vaRDBwvCS+XzV7HzQTs/BdB+fyKjzUxwTUkrBv+U+G7azM4ufZqcbRkJhp6ThQ7gG jp9LZzGVBhaWkgPV3EwTT/IcgbATm+s/lKxfnNQJ+flg46RZvmGQYfp8GlCckiZoIjiwzKAW+pQ GS+E8xZ9N4l0YSI0+Zn0R/gA+CRZJ4YDtGB05PJklPakFtk0fELV4stLv976O11+d+bdgOrPiAk 8sgkeqpJT116ppD9tl/ie0XOXFzJfUjLO6yVLnS9hHg4Y58= X-Received: by 2002:a05:600c:a03:b0:439:9424:1b70 with SMTP id 5b1f17b1804b1-441d054c884mr33139045e9.30.1746542568421; Tue, 06 May 2025 07:42:48 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441b89edfc2sm169603435e9.20.2025.05.06.07.42.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 07:42:47 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 28/32] hw/gpio/imx_gpio: Fix interpretation of GDIR polarity Date: Tue, 6 May 2025 15:42:10 +0100 Message-ID: <20250506144214.1221450-29-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250506144214.1221450-1-peter.maydell@linaro.org> References: <20250506144214.1221450-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x336.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Bernhard Beschow According to the i.MX 8M Plus reference manual, a GPIO pin is configured as an output when the corresponding bit in the GDIR register is set. The function imx_gpio_set_int_line() is intended to be a no-op if the pin is configured as an output, returning early in such cases. However, it inverts the condition. Fix this by returning early when the bit is set. cc: qemu-stable@nongnu.org Fixes: f44272809779 ("i.MX: Add GPIO device") Signed-off-by: Bernhard Beschow Message-id: 20250501183445.2389-4-shentey@gmail.com Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- hw/gpio/imx_gpio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/gpio/imx_gpio.c b/hw/gpio/imx_gpio.c index f23c52af26d..450ece45482 100644 --- a/hw/gpio/imx_gpio.c +++ b/hw/gpio/imx_gpio.c @@ -72,7 +72,7 @@ static void imx_gpio_update_int(IMXGPIOState *s) static void imx_gpio_set_int_line(IMXGPIOState *s, int line, IMXGPIOLevel level) { /* if this signal isn't configured as an input signal, nothing to do */ - if (!extract32(s->gdir, line, 1)) { + if (extract32(s->gdir, line, 1)) { return; } From patchwork Tue May 6 14:42:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 887833 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2589670wrq; Tue, 6 May 2025 07:51:24 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVKcz+L2rre5b/Ae28eLKP1AS2rtJrC9p0yzJ4q3vy9jxuPK7bPmMRwju+19RnaO1YoU45aKw==@linaro.org X-Google-Smtp-Source: AGHT+IG3Ig5FGiz7RSFOu6CzZhz26H7SFeLznqepP07rBWFdyLfo142c5K2dkeW9P4ut/xxUDarE X-Received: by 2002:a05:620a:460b:b0:7c9:2612:32d3 with SMTP id af79cd13be357-7cae3a92c34mr1418859185a.20.1746543084190; Tue, 06 May 2025 07:51:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746543084; cv=none; d=google.com; s=arc-20240605; b=DnRhrchHjXWCHhenaDsZjZKMLe7H0yiQmX1gFAoEvwcHt1xELpxYCJC4VdM69kLLh8 MFm+1r4BZ3gpxk0Wo8UY+u9yNrHHK4DXv/b8mH+iSx6tnLpb1qZ4OwfyUF5oHnfakL3d ZYfP2Eg2KzOj46/pFxi5DbX2yD20IpR6YYLvZzGZcFmd84wmfwv2fyMvT8Mud3o/l+Vr dYpdISK6YHhp3C3g7Qw7tinVcaFrYNbah5EcDAor9GwlJKzMpY1PxFC+x9UgMCxbynow zC0F4UYCEBtTWdtMgnDfWd085kz4+2sidzjcfRquF8TDA5YC2AKGONUCxrZIwQkAbU5t 03yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:to:from :dkim-signature; bh=IsF/CSowd+jniSJy7riyQNMBm1JGaQMWj1ippYdOx1k=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=SKZ+wliStrg46OOXst5DssXbKiHWIfZOpsy/B/EjUYPHIwOgEuDG5MwlTZ1p69LRm0 okrvoNNQ4+7pT+sFO/3J7yPNo40sY6lP5mZW99GtyGb9wCy03YGZ6z1AahV19QDhSp1f peDjiWv+PL08Q97LiJRNG4E6Y7BEfzwsmYfV5b4WHUrvmSvcy/p3CC5bXXtaqhSFR4lL QNsraXUp1O6GJ1/LFUJ3x6J0CIOJyB9Ox8RzH2M4xFOKD8Al9XV5OXWqSJSNWNBX9oFt BD3AsWTPbwfLL8aZvb5SGGGmm622jWzaO1VbXLIcKdglzCxfP3YmwdrV4qS/wNkaYrd6 6mKA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qPi0QCFg; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7cad24200aesi1207280885a.232.2025.05.06.07.51.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:51:24 -0700 (PDT) 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=qPi0QCFg; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCJYT-0007Nx-Ft; Tue, 06 May 2025 10:45:57 -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 1uCJVU-0002C1-NN for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:53 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJVS-0002BX-U1 for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:52 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-43d0c18e84eso25467935e9.3 for ; Tue, 06 May 2025 07:42:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542569; x=1747147369; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=IsF/CSowd+jniSJy7riyQNMBm1JGaQMWj1ippYdOx1k=; b=qPi0QCFg9qkRpp5zZoegQPTW7L/3j428P6QYkUB/Ab0pNN3waXOFsdxCanzr4DRXXy sEMRWK1df7UF7MwBCus+dJN4bLh9RhFeRw6EgsTCD/cM5OpjLCyqPS8y3x66rZsciJCH YePANTDMy9Kdu/78qspgief/StQUr1T2jN7JrQHc4U8h02svo74f5xlGXutP4SVW74JR dKc5CgJjZYHx0JeDfvZ3SQZnit5TRiKVGteo1kSfrXdP3vUF1ns9A6Qg678OJn063xSO /yUTCWhnWGEb37VI6l3f42uQz11CQ+f3Rtajf1GSwtNs5oolIofilwgiL8tpsyiE2hcV usvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542569; x=1747147369; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IsF/CSowd+jniSJy7riyQNMBm1JGaQMWj1ippYdOx1k=; b=eUEFEH7/drqTyvILrvHu5H+SOf85UNTAf6UP5RubBCyFFXpVvu4CjEZ3TWhAg/Xa6g QBbBnVtQsxr7K8594Xk8R/eEoAvVnlMSAtYwYvTMJ+FGhkQcwsjYrANKMIiwmch7Jp7/ /CQ8T6ChphK68j1lfbCwm9zRjRh6VuW427DLjpDUfLFgWtyltTjriBcOmR12ePGmJsae TpQvu7bjwOCg16u2V51pAiUKoOsMKQWrIeLwK5WtzihWNmT5nn8wh+bVHCSuqitQtvLZ 80heaWP5OuGfp7JJy8yWtKzA5s5AtkK2G8Th7VLpyStOBaiNl62pWalUhDN+dRUSpsNV dqAg== X-Gm-Message-State: AOJu0YxRL7TEmda3FzMK6UMksWPKnxqP4c0bAgNMAud130AOuPKgQSpP +j4T69nXxOLBYMh7YAei6T/cHdpC4p4zJFlWHfGPrg7uBkjlxd4yjRZpqd9pzZrKnwqr8CR0tjR B X-Gm-Gg: ASbGncv+zCO2b/n5ZBs4gelEcdGzYBKPvo+kow9KlhZyf6ygXsEaFvnRPCXab2CtI5e hkblclH/mkYemxQ3gK7Cv4zwF+i1aYLQoIPnM4+zg5SiPtnMVtwWxyQewlT+R6oF4zdGorG3fdP tXuzaTIytAEXq4sjDxUw0Fwyq5ie9YmTRWTcRaoLB/an/yR2aYI/T0b4VtDy5nbxsAw5tPovLS4 xCx7GJY283bCMfehoY/i8WXClDt1BTEMTNkef8EQz/ENYsOMjhNNsD89irqzvdyduqZ0NPmcu02 MaOh/0Wyt0o0+UVB3CvDqmC1yUAdksa81Cvv7X8dp6me9Kw= X-Received: by 2002:a05:600c:a413:b0:43a:ed4d:716c with SMTP id 5b1f17b1804b1-441cbc3e6c1mr54232805e9.22.1746542569236; Tue, 06 May 2025 07:42:49 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441b89edfc2sm169603435e9.20.2025.05.06.07.42.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 07:42:48 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 29/32] hw/arm/virt: Update comment about Multiprocessor Affinity Register Date: Tue, 6 May 2025 15:42:11 +0100 Message-ID: <20250506144214.1221450-30-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250506144214.1221450-1-peter.maydell@linaro.org> References: <20250506144214.1221450-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x333.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé Support on ARMv7 has been dropped in commit 82bf7ae84ce ("target/arm: Remove KVM support for 32-bit Arm hosts"). Update the comment in virt_cpu_mp_affinity() to avoid mentioning it. Suggested-by: Andrew Jones Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-id: 20250429153907.31866-2-philmd@linaro.org Signed-off-by: Peter Maydell --- hw/arm/virt.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index bd1a68673a7..03fef07c9da 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1766,12 +1766,7 @@ static uint64_t virt_cpu_mp_affinity(VirtMachineState *vms, int idx) uint8_t clustersz; /* - * Adjust MPIDR like 64-bit KVM hosts, which incorporate the - * GIC's target-list limitations. 32-bit KVM hosts currently - * always create clusters of 4 CPUs, but that is expected to - * change when they gain support for gicv3. When KVM is enabled - * it will override the changes we make here, therefore our - * purposes are to make TCG consistent (with 64-bit KVM hosts) + * Adjust MPIDR to make TCG consistent (with 64-bit KVM hosts) * and to improve SGI efficiency. */ if (vms->gic_version == VIRT_GIC_VERSION_2) { From patchwork Tue May 6 14:42:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 887819 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2588427wrq; Tue, 6 May 2025 07:48:33 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV1myIeEyjRGzIrR2IraRLEE5EseEMOt3EwwoZ4LvZCbOds8oX3w8oVyOfX0zfxBjEIl6Ujrw==@linaro.org X-Google-Smtp-Source: AGHT+IGXlaJZMQNAv/doZRzntauNxTu/v7UF0psvAw7AuUlx6nDA8csfbKidV74GSAUPt1z8+5cS X-Received: by 2002:a05:620a:2551:b0:7c5:cd33:4a90 with SMTP id af79cd13be357-7caf11333dbmr520457385a.25.1746542912733; Tue, 06 May 2025 07:48:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746542912; cv=none; d=google.com; s=arc-20240605; b=fLxswbRayfKuEg0/mRLEUUPUGFVScNfCc/v5sA0v2Y8Bqhblp4cus+GxsOkJGPzOjh ZfBbSNYuNXQzDdLZa+yt6P8Apj9AxtB05YFCnhTux2dAi1SmeTiUfzxRyaTCxzh4Irja /mWmfO2Frj3OjP+yf7cnZ7JfvENK+dkDKV6czfxRBanD5yhq+bXkoAzqkcSxGFeU8mKY USt2K21xQE7Tgp9MgXfEesXQ4MI1tQDmZkR3lq9IMe6625+/ei1VoXI97Eae1SYFtIIl fnwAUJeOYIhs1dqfTaLIF0zDWfgxQgeFGXRExNZHT5u7BcKwskoduIyScAP6NQjN+UZk 3qBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:to:from :dkim-signature; bh=2RTfICwtk/Jm8AeQp+Va+JmkenzgE6wYnGRvodGXX6U=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=IapeiEbU+MpVB/7bG9KQV40t7L0tEhL7VgBvn2Eawy8kuL3Bqp6BHd908ckpv5V+E/ RWWNprARXQAmWiFcLOxpU6u7Vs37fJ0R6OrdQOpczmhP+itmjKTU4nD7+lyWbnHXts2/ laScZwCiqcWn6V12DniFdfhbRqtGN3VssbfMWb8rkKnEBIeDTjy2GOljRY5Mu9sEQqGi Z4n+hv2WTA7a2b0T1uRseR7aAdEU89jQ+Lm2p8r61/k3YzTWHYPHk2c7+x3P+dQfrldS oi4J5AMpQpVmSm54pQEZYRYBg7mns53eZr9pVJcbREdI8hsu9rbcULvcUYXfu8v64f6z lFTw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QtdyPxea; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7cad2434eb4si1138388985a.373.2025.05.06.07.48.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:48:32 -0700 (PDT) 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=QtdyPxea; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCJXP-0003Ax-0U; Tue, 06 May 2025 10:44:51 -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 1uCJVV-0002CY-8L for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:53 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJVT-0002Bm-FU for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:52 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-43cf58eea0fso25817165e9.0 for ; Tue, 06 May 2025 07:42:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542570; x=1747147370; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=2RTfICwtk/Jm8AeQp+Va+JmkenzgE6wYnGRvodGXX6U=; b=QtdyPxeaG+XVrDKPhIz0Kj49imkMiH/LUMUDcctIQGER780YBwxSoe980MxMc3v7oj wcxGqb7hiUyIXSx/6aQ4SmPSzn6zgZ0LP9ty3557ZWOlbOhAOpoGBNe5DUEVTvqJpN8y bMtZsaINsiP+wpMh2gY70nMTQGl1BGeuki0uBrRqOjPy5FWzWtYB0RxoPrPZDvr/uFGx bJZcub7c2yVY7kQfSeBfASZoHbCIWnTmQgNBPy6yzztBC29QvxAc9h8HMk8ZFGUjpPpG fDfYkAXE7I4YjU3aGCRLcc2qbzG75dfMytbiz3wLnt3lfAaR/FcuiMd2maWYW01ee7hu 7Plw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542570; x=1747147370; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2RTfICwtk/Jm8AeQp+Va+JmkenzgE6wYnGRvodGXX6U=; b=uRFk4FV1WUYnFS8DaF11mplJS0db1o6QKtF/LsD39l/+SIVCPC7kG4GaOa+x2v8n8Q 3Q/kjAWcVnQ/g9MzUFJHJwyHsNlppz0KlTafM07jU5Fl9KzfUSgkocvvpUfuEt1tAQsi oRa4imWmqq8n+pcZv5gNTjBOFnMgisI7w/paA+ZCScqFgZ+0DB5LOGra57aVvGmvT/TL SelmLu8CZKph1pDSvi+UYkZ2ce1+7QciylnBg953axTq+0yEnrqEKV1exoendOe4n1Cs C+CMd6YjvLuH394uFNJi7dQIbnF5lZ9SoIoQls8YYgwtKn7dKw5n5RRmmgryhQsVxRzV CqLA== X-Gm-Message-State: AOJu0YxuIOZx1120IZHMjVU5zOlKYMI9EksMbIrNA1ix16JoHNdJh8af qJKQpVGRvkcG3YHf3bvQ6wimzYjLfgTWgUmMtiTgluI9e3KN5wZAMeMigftyXpz3EsIfdYsuRn7 / X-Gm-Gg: ASbGncuvRVPxdasir0mda4pBlT4fStWhKaOMa2AvnYhN0RGlammqz+e8zATAUNkePEH Hhqqkr5MXjSfsiwJEn/5AJSKiXe2Vpc3P0ILuNSjEMG3UA3FlZBfoKGyLzOB1cXUMOtN83D4Xhx Zosw1YlJQythJhMjTpwtuN6Ri84ylcsVkETYLHl8APjllplVKe29tqe/YVhl/gTwSVHlDzGJOoG WpnuVqfNQJaIgnv3GjqbzJz0HypccXyQfaB1Lx5eVswo9Oe524rRchkOb9uodT4dHYdxcCtxrzW xl8f/e3F7OI5eV1UuY88JQaHCE3dXgjKSGevwJGnfZi2FM8= X-Received: by 2002:a05:600c:1e01:b0:43c:f050:fee8 with SMTP id 5b1f17b1804b1-441bbf33f4emr135808365e9.20.1746542570100; Tue, 06 May 2025 07:42:50 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441b89edfc2sm169603435e9.20.2025.05.06.07.42.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 07:42:49 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 30/32] hw/arm/virt: Remove deprecated virt-3.0 machine Date: Tue, 6 May 2025 15:42:12 +0100 Message-ID: <20250506144214.1221450-31-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250506144214.1221450-1-peter.maydell@linaro.org> References: <20250506144214.1221450-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x330.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé This machine has been supported for a period of more than 6 years. According to our versioned machine support policy (see commit ce80c4fa6ff "docs: document special exception for machine type deprecation & removal") it can now be removed. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-id: 20250429153907.31866-3-philmd@linaro.org Signed-off-by: Peter Maydell --- hw/arm/virt.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 03fef07c9da..1e4841f036c 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3576,10 +3576,3 @@ static void virt_machine_3_1_options(MachineClass *mc) compat_props_add(mc->compat_props, hw_compat_3_1, hw_compat_3_1_len); } DEFINE_VIRT_MACHINE(3, 1) - -static void virt_machine_3_0_options(MachineClass *mc) -{ - virt_machine_3_1_options(mc); - compat_props_add(mc->compat_props, hw_compat_3_0, hw_compat_3_0_len); -} -DEFINE_VIRT_MACHINE(3, 0) From patchwork Tue May 6 14:42:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 887824 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2588712wrq; Tue, 6 May 2025 07:49:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWZXkdgn0sS2Ix7wb3oaz/S23tC+w78PZWpEZlanf3qB3aEk/EDdj/Ni7xGOpx+rearE6/U6Q==@linaro.org X-Google-Smtp-Source: AGHT+IFVYOy6Waj6bnhdAUyn6PtjJiKr4wWt3i4HpBbhsPrqx2Yk5kkVOBVxVCJLWQEXTKyaLaMa X-Received: by 2002:a05:620a:4c88:b0:7ca:c990:8fc7 with SMTP id af79cd13be357-7caf0929dc1mr463444285a.18.1746542953889; Tue, 06 May 2025 07:49:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746542953; cv=none; d=google.com; s=arc-20240605; b=GbjSYecSQEc3UvteHtrMv5YpUfl8ZxWEE3ex+z8zvEf+gjFPpAjReG1gaP0siwXguU 5TFKszN6EjrQqFlElFGJL1se+pbNS90la4JCrou5Yo5Y4WEvKotdNoBC27X4HhyRIn01 f6Ysae1fZJ2rZMoGEZ1KXsnMRXgutJW+juJ3iode/3BseiSHOEly9ZUKXIZvUu3aD09W L2CRiDDmcZ7iqYFogNH3wx1bZlT7V6mEh9XlDvzw+GJDnmJYbcGHuj6ddmTZIcF6s9e1 Ve/5CKbUsWiF70e0kNh0ugQ+IoqOJ8h+hx24KfZEVS4dH4hFEH00QSzCRqlcf79Q/c6Q AOcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:to:from :dkim-signature; bh=E9yfhXZokLgtDIcGcft1VTqGRAA3GZXFhIIB6HWLDaM=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=URV1gFlk+B6vZOMpfeiXF+gubX8xJuxDskjH6MOxByo9wG6JwyhlMmQgTP6yJTQzrf nT8UfuYmvPE3ZEIOocMOqyPeARuIVGgBL6tO4EiKVZ4JovZCWwhaw26G1SmHLn1KRUk1 37cJj361P9mB/wCFJZ1xtT74fh9AxdE+uAibeHLO9fVTcKcLKh0RsXsWkblDcNcIlK3E 7Ztq52nL5AG2DxsM7a2JSxDamIF2Wb5YNd9u5h/QwECunvJssjsQ4Ol33CDrbtLHWR3P j01y/6UrxkDOjw0cFmhDBmkgva1DblsCHBra3EyekNoyEiMqRzVl6znA4KjvcjGpj9xC wIcQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Bqjnw6Rq; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7cad23caf7esi1213641085a.176.2025.05.06.07.49.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:49:13 -0700 (PDT) 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=Bqjnw6Rq; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCJXZ-0003zE-4A; Tue, 06 May 2025 10:45:01 -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 1uCJVW-0002Ed-E9 for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:54 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJVU-0002C0-L2 for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:54 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-43edb40f357so30051835e9.0 for ; Tue, 06 May 2025 07:42:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542571; x=1747147371; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=E9yfhXZokLgtDIcGcft1VTqGRAA3GZXFhIIB6HWLDaM=; b=Bqjnw6Rqn7aX+l+qAhs3f9VX4gxLvJWBcQO3XdklKnbcJ3VIqai06n9oQPRyauhp7q LnyQ33m8jORvPQmIMuQb9cV8JGaoQ/DZwMOAtBC/e8+mfd7p2BqiiUZzrCsjOLr/mnWP OicvcFrS/iF+6X3soViyUxkfAXctk6uWC2Hle6a9sJs2DVTsO+Pf/J1kYlh3AThznsI1 FPm8S771raEpzYcxenpcqtjdTKC2j4teyHdMiNZ09HPJX0easRxhRBSdDDLIpIQzONM+ 6085rJPmO895eF7qv6003rWvqkDyDKX+G4fWQKnXYK9YpdHIoFNeLpjZs8Mit3s6Uazx LUtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542571; x=1747147371; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=E9yfhXZokLgtDIcGcft1VTqGRAA3GZXFhIIB6HWLDaM=; b=WKVLMWKNGbyG9EqhwFx8rF8v+lcnW9nYHotDR8NZbtUXf9HQlhFWWnul2dbDgalWNm VvNxaA4WjTVd+pzD2yM2s/dmWys9a21VlC4OyXYv2sOKLeDLA5KG7HQPoOD6TCMxlsws 2mVIgvpVEAeHPt0rIHeuzl2bemUUT3u/pDKkGgrcD7rGOD21pPIPXfHlIG4Zas9Tvxmx rNDSzCvGf5T8MiHcjTXGtO2fLvrUGJUkMC5c1AXIj20hVKZ3rOAxVbFv8C0KNI0eNCsS Bi5Mjop3HnYATy9t2+Fd1R2x9vH8Hnyyzw61/XyQzFhPTsNnriYvHU6tssQsxAsNUFNo b7ag== X-Gm-Message-State: AOJu0YzKjwpdsk258+1g+eBkKZtTQVBYPzdBvfMxhhO76aUxtdZ21+b6 C0mJDRENnPn4dJosG/F84luSyoiRt6F1Lmc9sVIbxuR04Qrrnvwk3dqi6LQzhxn0pe4qYnJLzPr l X-Gm-Gg: ASbGncuL73gpuMeEKmDSFO2TrXs21EgTkiChpuiwCG1UovDrWG3PJ1bDkxosnoVCy5V GpcvJqGgYW3QFh0403fi5jeBemnWaiwfbz++Z1QGzsyOeAnGY81PKxmusDcTjwYN0xacAbArq4m WXv1k1H394GXkF0//6HPlICQa2nWWGxJOG0WE7bjCE7z4MDLPnZDjZieEUBXFnQHkmui5kU+Ss0 K/dEMg0Wb2YZHkF8cEk+nVZV/syJZW0Pk6ec+yRtgoLJw7N17gts/7msTBLDB7r2k2Bv+KvDSKR g+VxMUlqS0lHWz43hL8jgPbhWDl0NHck4gt60EOuxXcA2mQw5g6JgBznqw== X-Received: by 2002:a05:600c:1394:b0:43c:fe15:41d4 with SMTP id 5b1f17b1804b1-441d0fd2c8bmr31543505e9.18.1746542570915; Tue, 06 May 2025 07:42:50 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441b89edfc2sm169603435e9.20.2025.05.06.07.42.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 07:42:50 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 31/32] hw/arm/virt: Remove deprecated virt-3.1 machine Date: Tue, 6 May 2025 15:42:13 +0100 Message-ID: <20250506144214.1221450-32-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250506144214.1221450-1-peter.maydell@linaro.org> References: <20250506144214.1221450-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x335.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé This machine has been supported for a period of more than 6 years. According to our versioned machine support policy (see commit ce80c4fa6ff "docs: document special exception for machine type deprecation & removal") it can now be removed. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-id: 20250429153907.31866-4-philmd@linaro.org Signed-off-by: Peter Maydell --- hw/arm/virt.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 1e4841f036c..61fd8557683 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3569,10 +3569,3 @@ static void virt_machine_4_0_options(MachineClass *mc) compat_props_add(mc->compat_props, hw_compat_4_0, hw_compat_4_0_len); } DEFINE_VIRT_MACHINE(4, 0) - -static void virt_machine_3_1_options(MachineClass *mc) -{ - virt_machine_4_0_options(mc); - compat_props_add(mc->compat_props, hw_compat_3_1, hw_compat_3_1_len); -} -DEFINE_VIRT_MACHINE(3, 1) From patchwork Tue May 6 14:42:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 887816 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2588236wrq; Tue, 6 May 2025 07:48:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUzrg8T/XwGGr2gGPDhmbq03T4Ea/OkN7CqmUnOzljk7xgRmPS45774sj1MS+nxVK4WVqaAWg==@linaro.org X-Google-Smtp-Source: AGHT+IEOC+vFiNV/Fmo1Ry04XaiPgasYxGqe9PMTdBNPdnTP3UAaOAAOTD4dzOm5uqrUvvoedIOE X-Received: by 2002:a05:620a:2589:b0:7c5:592c:c26 with SMTP id af79cd13be357-7cae3a926ccmr1244399685a.19.1746542882870; Tue, 06 May 2025 07:48:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746542882; cv=none; d=google.com; s=arc-20240605; b=INX0bvb/EjLCHzhwe3gg7EgBd995qPdANzWJff4jmuo1BS+8hc7iF+I6O5fQ733Ad2 yvR1vJC2wUaJ8G1TNRhx72fa0BU+4vdxNjjJSFn/Hga9SxakTHoWfBX681uPogx9Qnpb jcNh0iaMbeX9G9yUZZ4LkHqT1NsoZvGCULqyb69xqWKkPPn2l6Dji2DRn52e6w5J7DQo Z0Uy5rkZ1WO4B3l6RX3Asv/guRiErirM/roWLnulFF+WuE2jIgbx13ePbH9P0qSsg4Bm faA//RMrPbhyOfVYmB1Ikkfp1de8K8xU06TiISjiqyfhOE8qFI7LkMUuNXisUpBGgANj 35AQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:to:from :dkim-signature; bh=SO9Xgfyk1pTDBVZ7OMnTtvlGhHiuLgFtLd7XyJg4VAo=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=HrT4zqK/LixGxu5tk456a8+ortDc5QHB8vLScjBKYlo+bWW21EwS59dVqXKRh9U1+W Y3uRqzqAMmjxmxIdB6DZNCbHBZhjQLedrgbuAzLF+vM7r9uVWTkppphOTPqfrl1gIgel izDZtPLhdmquj6Id0+ENIUNk2PRmPlEpQz3dqzFiGyL/8hZKR1B101ZMa98CBu+2oGtD YFFBNAQU0Iw2rKS3R//y54wGrAMfYfVNvfMJa92+9Gq4mUYFWJqw6Hb2e9yKGUg1e2V1 IhNxwr8UfSLSxTztPszvFt8CP5CeUppuHpblRlzw7umoPjc961BMk+7CaERYckzxpPS8 Ejjw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LfG9PCFq; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7cad2421060si1128831785a.218.2025.05.06.07.48.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:48:02 -0700 (PDT) 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=LfG9PCFq; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCJXh-0004ln-5S; Tue, 06 May 2025 10:45:09 -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 1uCJVX-0002HE-7c for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:56 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJVV-0002C6-FC for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:54 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-43d0c18e84eso25468245e9.3 for ; Tue, 06 May 2025 07:42:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542572; x=1747147372; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=SO9Xgfyk1pTDBVZ7OMnTtvlGhHiuLgFtLd7XyJg4VAo=; b=LfG9PCFqmbG1S/g0urq5u4ZxnLk2Mo7s7IpnPGhUyRIZK4O8A2b28DOaeI2thdXKKY eRaxLvpOnWh+h2+3LZ+5MM6m65Pdc3/QVoux7ftYE75URe9jYBsPFiNr7LCkwtK6vVSi tu/Pwdfz4+yPa6VqB7V58vx2olyXRFit8wp34WJ/lQGol6YUpizgM91jxodJfNUoP/d6 e2vEk+VIs9oDxbfWb/1ny+K3e/ZE90m/mKQk3joHkpfxOYRmYsROQHFf/mWBpU6IOjtX zBkq2EYD4t/+xoYcD+TnIueS4t7R63iSOyKaSGm4/ZJCLe1Fwbe+Ju3fRhDrGtALBMvY ktjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542572; x=1747147372; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SO9Xgfyk1pTDBVZ7OMnTtvlGhHiuLgFtLd7XyJg4VAo=; b=gC5hGLKVhetDnUNCTdFAbLrErTMu3rN+Ec4lEt81rfzW7ZtMeOhyI+tyOK0coQL/3i oYE6Kw7QovYHCU2BMGrNz5TFqjferX6l8ccKUc3lq+sNUCi17u+4mlApIvqL/eBwvNEJ Mm9KwMSeRBAmPW92qIkWaruTnXpPieDI9eLo99Z/l/PQ1YzK7tzXPYxoEDyxc75HeWod 3VQafpmsI6XofkUsl9Xnu6fLlwGf67hKOxRa3XML4I5eKJYjXRGRzD+fsWyqfVosFADT PnqTEmZG1XoklQqHTppjdvz3UZF8u4NmTDbawS/GtYS2EVtP1EmKiJghW2LsXxdUL3Yf 8Oqw== X-Gm-Message-State: AOJu0YzU8258NW6lgxpvwj/80+geAbSUDHO5grKpUEAciDqvLrzw1/FV CDcMLcUrC2AeW5EfVq0liBMBrcpKk66uLH1IWm9xLYk2mmyfnnLiUUPLRjp5b6sT2MJS2Q8XWGq 0 X-Gm-Gg: ASbGncswg7ByIcZv1yfAIUxeO9Sk2lQQB7ZCijwv9cfuaVKPvunQseFE0dC/PPQNnsJ Wzk/GXk6r4Qtk0UwOiXMetas/8v05g1/z5p+n/100N+GHmO7xMMPzL51eFV5Oh7+orji5QmZuUE FlXjFvEOFZEKZxWZ+mVXQjjndDmsmkdCVpG+p/gwKqMmr9gsjrOVk2CCayjvwu8AsS/0pKBKyv1 OuVh7CGxRL8qBvmbZ2SYdB0xX3/oneHdahs9H4C359V4XJYu3EDrzB4AUDOAYJSkIskiFaFCWr+ LYTLikuTJOZHo1mRTJ4GGpyyoDC5EKQ1oViy/JAwDHWl+6w= X-Received: by 2002:a05:600c:ccc:b0:440:61eb:2ce5 with SMTP id 5b1f17b1804b1-441c48dbf02mr109325575e9.17.1746542571763; Tue, 06 May 2025 07:42:51 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441b89edfc2sm169603435e9.20.2025.05.06.07.42.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 07:42:51 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 32/32] hw/arm/virt: Remove deprecated virt-4.0 machine Date: Tue, 6 May 2025 15:42:14 +0100 Message-ID: <20250506144214.1221450-33-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250506144214.1221450-1-peter.maydell@linaro.org> References: <20250506144214.1221450-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=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: Philippe Mathieu-Daudé This machine has been supported for a period of more than 6 years. According to our versioned machine support policy (see commit ce80c4fa6ff "docs: document special exception for machine type deprecation & removal") it can now be removed. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-id: 20250429153907.31866-5-philmd@linaro.org Signed-off-by: Peter Maydell --- hw/arm/virt.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 61fd8557683..9a6cd085a37 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3562,10 +3562,3 @@ static void virt_machine_4_1_options(MachineClass *mc) mc->auto_enable_numa_with_memhp = false; } DEFINE_VIRT_MACHINE(4, 1) - -static void virt_machine_4_0_options(MachineClass *mc) -{ - virt_machine_4_1_options(mc); - compat_props_add(mc->compat_props, hw_compat_4_0, hw_compat_4_0_len); -} -DEFINE_VIRT_MACHINE(4, 0)