From patchwork Tue Apr 29 15:39:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 885749 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp393083wrq; Tue, 29 Apr 2025 08:40:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWOVC8NSojLqfEiyvm3OjJhCEQIpYL/Wfx7q9u2ciS8d0qb/PF/jnGIyWQG8NgA7ewGfRsgNw==@linaro.org X-Google-Smtp-Source: AGHT+IEEGlX40QCSvzTPGti6g6lM9IIUdPlCa2+3cN+S6Wf5M8rUbgohBl4EEvv6BFLEutlMemF6 X-Received: by 2002:a05:622a:6084:b0:476:89d2:8234 with SMTP id d75a77b69052e-48815a5a56fmr64642641cf.36.1745941226378; Tue, 29 Apr 2025 08:40:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745941226; cv=none; d=google.com; s=arc-20240605; b=Wl+cox3eCFMjAecRyXlR4MMt0jDsp0EODqV4ORsU2KF7UB8wkrVMQ4Ze6Zp4CrgOH8 UEYda7J4+zV9ncsw8H8CzA0tYRzkX/XT+0/3XZFv8ZLa46xLoa8t6prRPUIZEfc6hxWI /L6BHGQf00dYODpSLQgM4mGRKgFxdKqkDN8LRuZqiQ6imvqED24mg+RyP58T/n/BaVUY uMBTGQDmSqDKuAFg3lN69bavImx+tZ49nVUpu9sDJBXjp24TH7LripRBI//iF4HpEDtp 7XWZNq8Jujco1CEBOeQCdsLEvBQlhbNKyn5PLEdZG3INWSmfKTEmFWyC+JRFix5Z0uQk IvGA== 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:cc:to :from:dkim-signature; bh=B/dF9ePSe8e/Wos3Lfb/d8anPOw/xvpQ5gn6BfEi2A0=; fh=iarf4vSJHbIZ8TdXozm5ExYso7NSx7gagCLEIGxWsBE=; b=It0QgsPiM01vFj51M0u5E2KTiimhCZwejtEBP38tVDT8GsFRhaFpjWgmY8snwAF/ZH tPQaxhBKHIcdzzc6hyc1ihHSBb2HoY3ZokrQ3YrBkEG2ZasblHqGAAGOLrqJTfedyzSG dSOkGFYF/TstYiOJdIvQ+BXifGe5ALscgZx7D5CDicMafAZ3kUPZbNtJQcNa/nmrW8h1 aYYeEi10gTRO33JBC5VtNlJOkm3K++3M8oLBHIAo7j/xsVG2EfRXBXoFbYBeqc0auxqn DhZpk5vTisOptJAM/8no/XGhLW6SoOPwbEHGNnyuaJdRi1YNKvbVe9W2TIFaZvYf0Z3P ckVQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NqVkwhbP; 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-47ea1f95bf9si134593751cf.454.2025.04.29.08.40.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 Apr 2025 08:40:26 -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=NqVkwhbP; 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 1u9n3O-0006ca-Rq; Tue, 29 Apr 2025 11:39: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 1u9n3F-0006aC-V3 for qemu-devel@nongnu.org; Tue, 29 Apr 2025 11:39:24 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9n3D-0007bY-Hk for qemu-devel@nongnu.org; Tue, 29 Apr 2025 11:39:17 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-39ee682e0ddso4298375f8f.1 for ; Tue, 29 Apr 2025 08:39:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745941153; x=1746545953; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=B/dF9ePSe8e/Wos3Lfb/d8anPOw/xvpQ5gn6BfEi2A0=; b=NqVkwhbPE22isy/hBqQ10SsUqGu7BCoTaRiVFD1vrixdhUg+IHk30EV1NOMFGLAqzF /+3i/RScZutfTvCodUNYsyTEXJrkyKvw9hP4pjnwjqiewAjGQnrTVJ9mNDoBVeEMdRf6 nQLvSZLX1RWbMlBIZRqkfZuh+l3AbMYzYA67vThkXK5BoHR6LLW6uy0UIjFX1p/je36q Ub+6FNETUE2kqBTie0BiuF3TvgeVKOy1NDxmZANGfZilW4jGVwE+1Nh6bhLaCPmRzyMi 6VEntG09IIiRoyENbpgmXHRRsWhXdo2OcBYFlC8FccUgpiswLyvM7OCj3TFc63MIr5gp 2hSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745941153; x=1746545953; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=B/dF9ePSe8e/Wos3Lfb/d8anPOw/xvpQ5gn6BfEi2A0=; b=UQ+6YgRRkqTMatFLObNbSTfMNH3BuUHeaaGFW2FMFbDicAzpR5pDBjVyeEO8ULQhZF JHrOL69J+MD1c0afEfB+U8z68CB9fZ64qxRYH+7NMHEUszL/urK8WK2+34Em1NHHGeYe xvvPADK1XjYH3qFKRAZyProBNjn6lHCq6y4mZQHNpqOlktKtOnV7UwMOdhyLxPIbCA/Y NuXsE48m50e307ASHqwp7HY5WCVMXgdqAltDfoFiEN94VQ6Zxpm6yZVwni8esikGgG3H n1RhwljnbleCq8OuUU4hnOUokJHYHRNs9ZlqRV6V8cBcQs3o2+ALWXb0bw2pDrKd/h7n jj+Q== X-Gm-Message-State: AOJu0YzV7XiEpXWg3ir6wGTZZy/iHXj6pw9nbvJIDrJzQOFOlC5jWJrk mj5yiNw+naa7RRa1D7XjesSc0uFVZuvrWSvATdcrftcyZ0v2744xUP8hwVOo5Oai91AKqT++M2b M X-Gm-Gg: ASbGncv3tv5A7zcW/FMQSyY43JyTISn/6PvFQl7bZOA0OXTbXJq8P3UDuxkvrslOZm8 ozFYoOQE1Q0qEEjvt3c3GswXTNF7ci9t//jhjav36NWgZv24WshXVlKdph0lY9rsl1DbOS/KtcP 1gLV7wzg8JYfUKZ3eFWK5qt+672DOnBrefDd1HxwiQr4Cwx588X69UX3NqYd5jk/KFWkIWX7QX3 P9qiZMLPGvfWvijUWJ4tAMu3/XqO0epLdByT4rajCw0lGB1q9FYR1IvCKpRN705ITinygOAz1Wy Wp187isa0g9SqMLWAmGwSrwDr+1d7xjIC+Wf4tPa6eensJ/baaq3pQBiOGg24X3LbdhmrxXLUJq TYZsRE1PcK0uF4QkdZNX8aTHgLnx3DdA= X-Received: by 2002:a5d:444e:0:b0:39a:ca04:3dff with SMTP id ffacd0b85a97d-3a07ab9bce2mr8812412f8f.40.1745941153506; Tue, 29 Apr 2025 08:39:13 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a073c8d60asm14560685f8f.18.2025.04.29.08.39.12 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 08:39:13 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Peter Maydell , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Andrew Jones Subject: [PATCH 1/4] hw/arm/virt: Update comment about Multiprocessor Affinity Register Date: Tue, 29 Apr 2025 17:39:04 +0200 Message-ID: <20250429153907.31866-2-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250429153907.31866-1-philmd@linaro.org> References: <20250429153907.31866-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=philmd@linaro.org; helo=mail-wr1-x436.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.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 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é --- 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 7e3933066f2..83bd1152804 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1767,12 +1767,7 @@ static uint64_t virt_cpu_mp_affinity(VirtMachineState *vms, int idx) VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms); /* - * 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 Apr 29 15:39:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 885750 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp393169wrq; Tue, 29 Apr 2025 08:40:38 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUcELT2zlKG2XW4Swvc/Pc7AT8WMg3W1NHp6m3zNzMg2ZsXvPQwTAMxr05poLl34ckBIs/rQw==@linaro.org X-Google-Smtp-Source: AGHT+IG71PKTA6xdklGY+nknMXpa8LDiTOWqtIAr8gg0NfyX5PRGiEG43onY3qh3YF7yUSd3vop0 X-Received: by 2002:a05:620a:2a0c:b0:7c5:59a6:bae2 with SMTP id af79cd13be357-7c966863bf5mr2180241185a.4.1745941237902; Tue, 29 Apr 2025 08:40:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745941237; cv=none; d=google.com; s=arc-20240605; b=OFGotsj3p7IdMVAde5Pyu8DMR8YtqmSdplfeL7W15+WhOORvNYsp/ZdpYnY8gFMr8Q JKpklHX84D8fklRReBbCnLlfKN4CnUjOJwQma3YcgIg+0jZm8YFomN3OrATBvnREqXkn rSbWEXzi6s6dZ7i/hn7VphY22BLN5UZ56tEnFSvrenpYKSVqyIufMu34CSGVEkSaGJSO qRWLSmNvSGDC9FRnbwgJ8Vjrv+Ru9Re8Juu586eXQaRKW8rTRp41BF7hEu+2dQpFBYY4 46Sr4MBillzsl3GQtpAUhFx87NuCbLIeKBvqHcB+TmV3XxVRvJM1XDkUzsR5OW+I/z86 th/g== 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:cc:to :from:dkim-signature; bh=eqNWxGIMem4uer7YASxHLzlAMSlAZlNycae1AJ5U3ss=; fh=DKQFoSm5rvXVk6AUqpSavFv+IR+qPwKdgcCOIx8jJm4=; b=kMHkkyEAJJ5u2OXA3mD+nnXRWIUJQAHtDlteRVKXCuhOEyBhQWy6+OqVlNEqz4sqLG NZWGFEuPDbzrFRP46ON8+fWjJ44jZTkn6tP99gV9wH415WhACbHMmDKsYj9lV8Kj9HD+ KdTDtffydAdmYSWHcLH8UngrRJ41GR28Iq3dAYni+/q5aL++D1nSuuGAEEsI2OLuDE1m 3HltuhmpdkBAu186hUQIFyQ7eGRkRnva1/yA+2JHk2jreKlZq7xqoYmtytfPVU1bMmMp yEHfesv6q+XTxk+i00QVsQNqYfDAYE1BPjaIQbYOw89rXkP4EhiBg5+EjJKqrfCSd1od I8fg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Vk0P5cEO; 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-7c958c9b73bsi1241666685a.58.2025.04.29.08.40.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 Apr 2025 08:40:37 -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=Vk0P5cEO; 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 1u9n3V-0006me-7B; Tue, 29 Apr 2025 11:39:33 -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 1u9n3N-0006c9-L4 for qemu-devel@nongnu.org; Tue, 29 Apr 2025 11:39:26 -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 1u9n3K-0007cW-45 for qemu-devel@nongnu.org; Tue, 29 Apr 2025 11:39:25 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-43cfa7e7f54so41714005e9.1 for ; Tue, 29 Apr 2025 08:39:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745941158; x=1746545958; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=eqNWxGIMem4uer7YASxHLzlAMSlAZlNycae1AJ5U3ss=; b=Vk0P5cEOyIuNdaLMgM8k0PgGp6d+EJBOimM+w2KciDnS3ktzFY4wkBf92Iw/sOXCXc f34r96H/zsUa8VJsRBOo0gMD0EVEkTK2ERelBXC9NdNXwriD1nRyVbfT/dyPw4ODd8PN c0vIfw0HoT9MOPyvyiFqAfO3eklgNYQj6g7AMYhKboMckQIQtIeMFxyXplcBh7qYdVFL IUbNTJ6m4mIWq/ego3lImULoM5vLa/GowcWjAVqGzdPM2c5vOEGXTynJP59V7g2ZxuyM aYrD/BFN++M7VeYkXmHdrZ4nPeTEHzDODZk8DtcMym06uR26bsWTbDfZcX/fvIXpWhNn oizA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745941158; x=1746545958; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eqNWxGIMem4uer7YASxHLzlAMSlAZlNycae1AJ5U3ss=; b=tQ7ma4QjsCe6sDiEFtPElIFkqwKlw41v+YncqYByfNr8ld6XPIfTAspTG3GmtIz6sY SX8MAawltwED89MxafJGOIUwdcXgjDpJnG9TrN5vWec1NCZp4lM1Z6OKwwaj/swG0Z+K LvgqcIq+I/+imBu6V3+cFkkzIBhqULK1qJnvVXiOmghdxzBCjC3EKH7vNNqvAU3l4qxK cR/9VV7v1RpcFmkDPZ12ul9HGVRX7VsymHSnXbx7blUEnDv4hmUiFm2JK1mCMnX5JEZA dPDfqbAZg7ttvZPeBXf961Jo8OhqQeNcASmuttvvhPUVuI5rQGlgwKCHtNgbQe1K+Wak jVxg== X-Gm-Message-State: AOJu0YwI0nDnrUE8mjaPay74FbNMOGWC6rdzpiyPUFiO9/1kb1Bm++9R L1YBamWQ5T4duFlUsW0ajcfZtZl0HRDVyGNrjWsq6SA3Qq42Z2Naz9SBu4s4+WJdO3kPtqTpug+ 9 X-Gm-Gg: ASbGnctaY4BQumZ+iIQfwkMSm4O1c3E6yEMiDiQLJOXxJFij7uhpEsBJBNhI0y0Eq1a XqvlaiKoIYXRQsXARq7+mkX5/NPAySP3JPvdCEm5Be6zMJ0EJ0YbO9y9k3+EnIYHFDzTqfKmI+g YnE0+8k2BG9NPEmwsv8ozHbtVoU5XV8d5QiRpJ3skr5dbsW92lE9v3LSZm68fFqLWjF+hUL9y5O bNKsarpYlXRjuFLwbrBqcWwkDN+0JA+BQx/0GKtDvFWjsAC1ChX7JxrkfaYlqa8HQP1xia2EAJe rR0Pp1/gIAnG0gZNNNzcJaVc18PuwFOdvVzdxXpaMLbCPQZYATKFiDaIWCICjDiJNbirpwL4SuK LvjJ6ZbC4mzRnqWckqaNV X-Received: by 2002:a05:600c:870f:b0:439:873a:1114 with SMTP id 5b1f17b1804b1-441acb065eamr34645175e9.6.1745941158356; Tue, 29 Apr 2025 08:39:18 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441ad8149afsm13772635e9.0.2025.04.29.08.39.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 08:39:17 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Peter Maydell , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 2/4] hw/arm/virt: Remove deprecated virt-3.0 machine Date: Tue, 29 Apr 2025 17:39:05 +0200 Message-ID: <20250429153907.31866-3-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250429153907.31866-1-philmd@linaro.org> References: <20250429153907.31866-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=philmd@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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This 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é --- hw/arm/virt.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 83bd1152804..f70d90d12eb 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3577,10 +3577,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 Apr 29 15:39:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 885748 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp393023wrq; Tue, 29 Apr 2025 08:40:15 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWs/DBSsQtxKj5noXBiHbjz8kETOYGF610diDB7TqCEqV67mIfe1mQYCrdU/Tsa1HgbhlJR2A==@linaro.org X-Google-Smtp-Source: AGHT+IGtwc77mIemcMASMG+ibGTaDkkCGnLPABNsWMaZ15jO6+q2luGFi/VgRcpSaSF/M0yiQG0C X-Received: by 2002:a05:6214:2525:b0:6e8:fe60:fded with SMTP id 6a1803df08f44-6f4f1c7a964mr46249226d6.30.1745941215753; Tue, 29 Apr 2025 08:40:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745941215; cv=none; d=google.com; s=arc-20240605; b=SicMJmygfzCCP1s3WVYAaBZzcWJt3Fbl4YFMtOfHl26HEgcT2K1jiyUnq9pGXP5bcx Tgu3B1ffSdBaH7Xo4EjucKRSuN2f+Nzldo5zvCc7FXB2vSPXcU93cOCoHWg8ekuP62Hs ge/L1dIThNBitFo56Jfw+0+4kc/O3yaVTnxDE8lrl/YF/loK9le0rVTUqWm8EsHK8xSl 7nU/83bz6X02SYReRjw4WTm6Fn23rfpbH280MasJT19F5Cald3C4grRjSt4JkLw2YuZN mXb1SrNQw/8qIagSx6QfOu6gt/O80wtXTu2kOtliRYFTCJWxbPHgRKEJeHgXrtUCPvcf gFAQ== 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:cc:to :from:dkim-signature; bh=e8jtYz/pm0MOVEXjDxd+0O3U5LV+mIpnGicCzP3Uyik=; fh=DKQFoSm5rvXVk6AUqpSavFv+IR+qPwKdgcCOIx8jJm4=; b=RO3yanFySvOw+dI0+4N9svoHBFVLVkHek49vY1Op1YyrJI79FqIBXOMNcRRPo7tlJ0 /RcDv7f/KjEjIgTcmSy1G3wQml2Tm6t7LIWOXoCBt41MuXzr2CffXlZbnmw3o2/pdNcq Ybwiz7LWB4CGoEdBxgZ4r+j6m7hPkUI0FsDNYeind8tug3+q24ZbOYF7p8ncNGu4PqiF 0ADu0WR6zFITjzVWUW1vVN8fz5DXCbWqpkqd165S2kVh45JOYllZaPktZ58PhZ+XXRar p0J95JjpKm12c+nkbRl0tOQ1VbzZ5aOpUyU2zcwzkWvqmOQOVbcCLZtukqoJI+Sa85ZJ pvpw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=paINkDjI; 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-6f4c192b71esi131944196d6.234.2025.04.29.08.40.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 Apr 2025 08:40:15 -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=paINkDjI; 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 1u9n3X-0006qP-Gv; Tue, 29 Apr 2025 11:39: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 1u9n3O-0006ce-UK for qemu-devel@nongnu.org; Tue, 29 Apr 2025 11:39:27 -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 1u9n3N-0007dO-9d for qemu-devel@nongnu.org; Tue, 29 Apr 2025 11:39:26 -0400 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-39d83782ef6so4978235f8f.0 for ; Tue, 29 Apr 2025 08:39:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745941163; x=1746545963; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=e8jtYz/pm0MOVEXjDxd+0O3U5LV+mIpnGicCzP3Uyik=; b=paINkDjItM+KWbiZtNH4fimYMn6CQw4BvGMUU+hdvPvnVagb6pxMGWiVNYU6jTaSTi ik5LyHV4t8ryFPzj7IQ33YaEFI44tUmorOnGZbALPSsizOc+0hgsWe5OUhJ3laNBk2vU 3zLkPJuIN84PNIG4rFe+1587ClZQk9XOKkbI5/TrepuGmjY+GBm31B0FN/jDkX4UB9mK iWakEq8XfR3ESxOKOYwT64/VP6kWZdNiugGvRTB2TgpbGrDpSbZ5ZP6VZAJtNTxZUgd+ CyHLJ70oLh9ZjBw06DY2zp/DMRxBJfpas8G1/IsM2D5hUKNE5oIuhI1hG/SnLUD7y08p SBhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745941163; x=1746545963; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=e8jtYz/pm0MOVEXjDxd+0O3U5LV+mIpnGicCzP3Uyik=; b=v2qQyoMpKfmzf9ZVVoDcbVtwVaZpTC6h7meAlUjKQR5vLH1m7DeG7b5khNRAYH/K+I kDPHoLi00FIxQbdl18Yh9rIvk3Odfk9GdJaed5gyaffWISeCpML3Nz3tf2GDHSxUGxkH x6gMIHT42n5uIGGsRmK9wb8I5QBoHnAhNG9pKPVoQY8kjDUDcauKby3cla7j+Iz6+aFP 381/CuR7R1jlNOQCWJPgXINsyS9hw153OsDN1mDeizfyybNMqLPFng132sVATp5Bgxa+ +DEOGZR8n4mbOicx96VLG8FY8NGx3cky+4YNPx1tvdcA7lyucTNAc2/gEc/5zi6cfShb g63A== X-Gm-Message-State: AOJu0Yya04WrxiZhVLUYZ1V5+3nCmEJIH1DECArK/YyZs2tavK9PjVcQ FZ0GBGJ5ySRgHimW3n8m0GrlGLzYA7zEoyKxPvc4E3TOIKJmOX+kH7aTuh+fZqEF9/yiqswfHZV n X-Gm-Gg: ASbGncs9oFgYcW5uPthIuf4C1/fLhg6dwNo+JYPVwvDrPkLSDqKc8GooY+xQe04I8VM ff7dfATtLMB1vQpSeiHV20bg7J6XEhlfCoU9V9jiVr/HLN2s+9jkT6Hr/za++GeEH9qbPFcSBdG XEID15ZOE71+E/zeUqAQXbQXu1Rl8t0e1dtSsH2aGiibAhzEqGvDTja4k0UyrmTbMt0ZhlOuqZx QNtWMbyFK3K0cm+0Ku7DlIjnvXnY7fWQBysXweSegm8JIaAyl48alXhJX2PlBNVV1iYKDcJ3RVZ 1fv5i0t7h1d0rF16tppIIVk5w3beRXTCtY2EpZrblI4UENHvToo10OY02acE4ccAC6c6PYhgkO5 WHanEcmlhn2AAjTf8qsxX X-Received: by 2002:a05:6000:228a:b0:3a0:8536:1261 with SMTP id ffacd0b85a97d-3a08a513362mr3207285f8f.8.1745941162933; Tue, 29 Apr 2025 08:39:22 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-440a53874a9sm160553965e9.34.2025.04.29.08.39.22 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 08:39:22 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Peter Maydell , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 3/4] hw/arm/virt: Remove deprecated virt-3.1 machine Date: Tue, 29 Apr 2025 17:39:06 +0200 Message-ID: <20250429153907.31866-4-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250429153907.31866-1-philmd@linaro.org> References: <20250429153907.31866-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=philmd@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=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This 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é --- hw/arm/virt.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index f70d90d12eb..bccbc54073e 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3570,10 +3570,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 Apr 29 15:39:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 885751 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:38f:210b:807b with SMTP id g4csp393280wrq; Tue, 29 Apr 2025 08:40:56 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVOG34fRYOU2OztMxNDL4s6Ud15HOL1+5FnQZF0UJ5XKbW8Fo4NXoF4yFiXppw0ihsc0335jw==@linaro.org X-Google-Smtp-Source: AGHT+IFJ+NkcfbN8jA+YgEeDvpFrRKXu1zsSb13xuE19eaXZSegQdgDEn9z/DLIjPM6xl8ZzOGfI X-Received: by 2002:ad4:5ce3:0:b0:6f4:d566:a177 with SMTP id 6a1803df08f44-6f4f03b67a1mr63048166d6.0.1745941255803; Tue, 29 Apr 2025 08:40:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745941255; cv=none; d=google.com; s=arc-20240605; b=WXAsy8I1HndfE38I9cbDFp1Op6S6O5R7IsKFQAQ8EVNNPzfAHb3UlKPxv3AvxLZLxI jMRWctM4+7nFwWLBAXTNVUVbNMGELf2Yff/ULVsZqCBCNhVnQAn1s9QLSg9N+5nbd8dm XifO5zhwUWFigI/t99XHeRzQ7xWRRvB/PXJQlPuZKAP1KkwgFVOTe3i9y7pkxFim5IDb VeDvwmN1t+ckADbDH16O2clkXRFpprMBKRCND2xok7ZLvDR0Rr7vQP8+wRj/+61N9w5M BwxC+xXNpuV+zoUvTl1wVdQwg9fPKD10B7X8Q6Pim3irQvpvj3N63BYcV9mq026q2K6t 2isQ== 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:cc:to :from:dkim-signature; bh=BvMuIcy7uWLKoIFwC4B1ZONwZFZEu+NYFeyFXhIve0M=; fh=DKQFoSm5rvXVk6AUqpSavFv+IR+qPwKdgcCOIx8jJm4=; b=gt0At5OdwmmA/AiIMAC3lBz+4l/qns6KlhOxfXInv2Qo+XMXjL4wO+SJRi5wFlO5F9 2WFgu4cXLTgzvuWYaWIHWfrw84cmotW1i/NgVUxdnM5IMEu7tMdT36bizywi1Sv3VWAu ekwUNgOEay9h8WblCUeeAYsDWE7oyTfDMNml+9uO9iCgwYR07BQV9HkBLe2end0PSS3I accM40jI9FKY9bwQpt4pcyu71x0J3qFEsNpaFM/ckJI4YGE3x3oDj47yj+GDQ18HIBkG zpR5/nWSenDp8FSYTQ0RjApAR4C5lBVqQYYq8uWthE+Y9Eklb8G8ZcxhPwQits4f0hai PSKQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SohTDoJO; 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-6f4c0ae9f06si125650206d6.317.2025.04.29.08.40.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 Apr 2025 08:40:55 -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=SohTDoJO; 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 1u9n3c-0006wd-0Q; Tue, 29 Apr 2025 11:39: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 1u9n3V-0006mq-6U for qemu-devel@nongnu.org; Tue, 29 Apr 2025 11:39:33 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9n3R-0007eZ-Pg for qemu-devel@nongnu.org; Tue, 29 Apr 2025 11:39:31 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-3912fdddf8fso4612930f8f.1 for ; Tue, 29 Apr 2025 08:39:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1745941167; x=1746545967; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BvMuIcy7uWLKoIFwC4B1ZONwZFZEu+NYFeyFXhIve0M=; b=SohTDoJOl6rKTE9RuAl/DomJU2IME7t9RsMEyZ4XXJqO0cxrgeQpzafoCeF1F9qBAi ODLTh3gA+eo0WBsQDbmYEzBcEdKP9+qtZRhdJDVfxBz7ipq2xbW0jxCjAeovpDq9nyu/ O5QoSiGgZFld1M9ejRB6hxwuOwNuDLlwYUT1hlk4BonromnZO2gM8Nh5dh1XSQA2zJuw oVaTdLBIXMqhnIjjSS6mnN+xp+e5I+lsIIwCH33br2h8YxbEl/C8UzTEuB1ON9tfYUjw xoAE8jk27BKRgpZnD/05iQsiDf+u00JcxlinF3Cr15p03+qzxAh1mpFOj1Ii+4tpbPcP Pi1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745941167; x=1746545967; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BvMuIcy7uWLKoIFwC4B1ZONwZFZEu+NYFeyFXhIve0M=; b=ElEdFonxdCy5WrmATG9wkol/nD7GvO72rftjjz7TFEWkfBe468nUrqMoipy506Ogpz bJ4N2509HOnaHqiCAPB72zyvKQ0FHlJcaDCY1fW5jR27rCLzBWcPxxTWesenRqP26E4V qcP3uUvtvU3fnqso5Um0jjE6INfWpLPaSkV0IPuXVOWLzPGh17CF9zazT81rthj6y4ca vA6TJWiMALX7DMvfqBeeOCv89UroBSMtJYjSTXIggHWeLyUkUmlI7XjMoUddeUsGMPoT 1LLd9uVCNbgT5YDkLhEdl9Qy4QxERwh3ct6o6S+vW3qmI81Xz9BRxHVsS1SWeWYcqpVt EQ4A== X-Gm-Message-State: AOJu0YxdVU0L56omiiBzFt4EpJ7wSSdUQmLId41MpMN7FcSU0N2tHW6D jYjPArQo7qNdr1qVVZZmytBWcde1mWLAlVmdXtaGuz0HgjiHiMBhnDXe15EyUvFYt6c7oPsf4Up y X-Gm-Gg: ASbGncsp+d9TtbxQnFKduWnx7zTMi41KpqRQpsWsojDAjYc3yHJOhs/WUvLAzQuNOTN oqm6FEliw9Je97hh2sposmE8xoIRW4gCWvL0AbT2Y/rzImC/mP9nSj0aNA/2E7r9PhWTv+N0d+Y i4k3ZUh9Au4WBVoR2HOurEgOLyNbVPR0UyPj2hHh/8e36U8oDnSdyAlzF0axf1YMfHQGf5H9r6G IZKlPgmQmS5KvNClLUapOb02k+1yWCC0CZ4fVy+Pj2IV9z3opqGbBqS1ELt7rwiiJPjXQ5znJ6W okJlcCSjqBEdyjGThtNhiaHAzlv461Jkyrt8XGneLSfv6DUXr9n1Su28i/+qHHG+lmoa14Jk44J taSrvfysNacAYYbkVaPm/VFboGxxZE1E= X-Received: by 2002:a05:6000:400e:b0:39f:cfc:d520 with SMTP id ffacd0b85a97d-3a08a51f5aemr3425102f8f.15.1745941167596; Tue, 29 Apr 2025 08:39:27 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a073e46517sm14306959f8f.71.2025.04.29.08.39.26 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 29 Apr 2025 08:39:27 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Peter Maydell , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 4/4] hw/arm/virt: Remove deprecated virt-4.0 machine Date: Tue, 29 Apr 2025 17:39:07 +0200 Message-ID: <20250429153907.31866-5-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250429153907.31866-1-philmd@linaro.org> References: <20250429153907.31866-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=philmd@linaro.org; helo=mail-wr1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This 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é --- hw/arm/virt.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index bccbc54073e..f4e5a93f0c5 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3563,10 +3563,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)