From patchwork Wed Jan 15 17:10: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: 857606 Delivered-To: patch@linaro.org Received: by 2002:a5d:525c:0:b0:385:e875:8a9e with SMTP id k28csp2580702wrc; Wed, 15 Jan 2025 09:11:42 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVuqQr+kOcpS8MWKMMnaORsCpNbzFzmeo6uOTKL4BSGSKQbUYH6c5trXbllSaMcO65fydGb0w==@linaro.org X-Google-Smtp-Source: AGHT+IGU684SVA172BYaU2AAs9RKE9DAdxtl248wHdyZLikc/CUatm91ImWJelGpV+tkMB3NkBkH X-Received: by 2002:a05:620a:258e:b0:7b1:4ddc:165d with SMTP id af79cd13be357-7bcd9728f48mr4546745085a.13.1736961102498; Wed, 15 Jan 2025 09:11:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1736961102; cv=none; d=google.com; s=arc-20240605; b=bBCGSIwNPtEl2d4hyHnVGiX47b5C8Auk5asuYekHL2Jn/t5I0laDwsK9XXh5AnLGqo D+nciA3b4dM1OksjpGwwFIzWfDcPerj0rvwZeEujEsTFEbcKO6O3FoKL/97Udm5jyK8Q 0em/HSdXTCAS66XZnCKeIvx8/yBl5Qxi/vJELZ3owHH+adW62hawiB/4BqzlTxmZGAdY kuhxC+CRwL3bZP7ZdJiBheOgTwYuqneDZyRlUQCmKKEvNt6AvWIXL59pfnZgnjygKSxl TqHzctKSDtro/1tsPo8cPCX54+VJ4LwL5mrZBphlJlUttKxUHtNAkQAFKG+E2GN38TRm uxzg== 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=RVAJtatL/ZPpb9lJWM6F+L2p6a5jhKW94ak9z8z1WWM=; fh=AJ3qCIQ5DJZT11MzfbCwuu67/MTA0x1zWNBwak43Xwk=; b=jSMPE3WNGzCPvOBcNBgPaarDdznJ33imonStMg/vUfSXtoV9auRlUbrD9SNd0xPrQ7 3W9RqAmu4Q8hdNMBk4xK7t4IoPVI3HtXDZJ/dHmwktnT2DxtapwwoVmsSViiFXZnKIMR PeSZgcc+HsE+B/30CLjqQErSNaknXyAvC6ixkrGIp3TGZmFo8NOZC/vHTsCXYRJH2kUL twmToKfUWwQI96+DHy5T9b5Z6ys2gQ8mv4Ra00hsV1FW+sDGRjKlgmoigGPlX5fBLGfI snixE+J0Tpi33rY4iC8ly3vl/p72zCxkdX39M46uT3LGnQtgeJxCddS3Dr3IARNJy60W 4JVQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="a5/FHipK"; 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-7bce3308764si1645437785a.265.2025.01.15.09.11.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Jan 2025 09:11:42 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="a5/FHipK"; 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 1tY6v3-0007i1-V3; Wed, 15 Jan 2025 12:11:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tY6v1-0007g1-IT for qemu-devel@nongnu.org; Wed, 15 Jan 2025 12:11:03 -0500 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 1tY6uz-0006cC-AU for qemu-devel@nongnu.org; Wed, 15 Jan 2025 12:11:02 -0500 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-436249df846so48733355e9.3 for ; Wed, 15 Jan 2025 09:11:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1736961059; x=1737565859; 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=RVAJtatL/ZPpb9lJWM6F+L2p6a5jhKW94ak9z8z1WWM=; b=a5/FHipK8O54Bj6AOVKjPw3K82sa2M7k1XFu8KzD29RzpWnFMXHmTf8eA3/7Jkp1xu xMPlJBN01V2GTr8tp6BayAMZvKJtSW58hZUR6fbKkZnpyMSN5Z+2Xo8QBAW2jiQQgOdp bPIylf5LYOA/2p7NqDwdhfupxTf2/XeklfT0wiYZx782FDByZasOyXaaHrcizVmdUAjr lZSJJfu+wk8cGGT/QAS72l+1sIiAZuwChrcPB5kvvsRGlKIIfUGxdVlBCATsdXmCkrfO Uqu6Ka/KEPengw5uDxS5+dOZzNDkxfIOJDq/d0KIbPtxrPW1O6bELof7NlkDKAfag7pK Wp4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736961059; x=1737565859; 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=RVAJtatL/ZPpb9lJWM6F+L2p6a5jhKW94ak9z8z1WWM=; b=bdzcNBL2ZKHnQy1bAEEEm9/rzMSsyaFV4cCB+hyVNpb73zKNR3o/eb8XZorIiIfpJ3 pAwqXJc/nmWg9MaFOzrXKy7BGCS3P2ZJUu3aDS5rXEwXW5FvdBu3kZlAHSiBQFOYyb5t lNqYXnlSp1d7FM7IH97F8z/LpJ0GeDJpMHPWf0E6OmymjQZCsDwCBwdmdYFj3WPzfwP0 8w/abdCvpFBOBVdwh4zFuIoqIuOdu4isYjufsJovS7hiI5XgYvDqnwbjTWIepzZYUqPg 7trX4JFZJygwR7UfBu3jPT1h5UmuXGzimTLp1SiSiTQliLsRVRfhAgR8uZ2fxWB4SPP6 uNdw== X-Gm-Message-State: AOJu0YyBc5cqHBkJH7myTME9G0qfa+RnaqiW0R9SzC0fGJrMOG1hUjHn dUKYF3Qo8BZnX26twmEtfO82v3SZ5L6ltqcuOLOFaKKr+3dASRchYifutrlCjkGrbxlzR1YQdNV kQ1o= X-Gm-Gg: ASbGncuNqEoAGBZw4zXZHW+6fA8UGIyQYrI14olJ/FVwQx9FkDKvBi2vA1g8khlDYJR UTcow/i5miyKjTQPkYB39bj3KhlhcCd7LTkP1welLhlf+HWS+THu4an+s5eGhaRsTR08OoL/TqX JF6yGoZOMGiVWjHgWf9/gnQ062mwXBQPIBM+942sNqFmPEo1mQf+4Rkm2Tt1wIMkWIoRTDEjLXo h9h92gRUds2oxOhqHtpIrHmo6jQD0ktScdCQsYl9xERmoLJtC32jC4fSCZH7A6eT/WWOSquFeeB Vs70mj3YWOG7szYcuLANlPuWFT60bwnul2D7 X-Received: by 2002:a05:6000:1f85:b0:386:4a0c:fe17 with SMTP id ffacd0b85a97d-38a872e9105mr26380872f8f.27.1736961059142; Wed, 15 Jan 2025 09:10:59 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38a8e38378csm18013507f8f.25.2025.01.15.09.10.58 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 15 Jan 2025 09:10:58 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Ani Sinha , Igor Mammedov , Thomas Huth , Peter Maydell , Andrew Jones , qemu-arm@nongnu.org, Shannon Zhao , "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Subject: [PATCH 10/13] hw/arm/virt: Remove deprecated virt-2.11 machine Date: Wed, 15 Jan 2025 18:10:06 +0100 Message-ID: <20250115171009.19302-11-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250115171009.19302-1-philmd@linaro.org> References: <20250115171009.19302-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 machines 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é --- docs/about/removed-features.rst | 2 +- hw/arm/virt.c | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst index 7c8b98fcdf9..0594bbd4363 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -1065,7 +1065,7 @@ for all machine types using the PXA2xx and OMAP2 SoCs. We are also dropping the ``cheetah`` OMAP1 board, because we don't have any test images for it and don't know of anybody who does. -Arm ``virt-2.6`` up to ``virt-2.10`` (removed in 10.0) +Arm ``virt-2.6`` up to ``virt-2.11`` (removed in 10.0) '''''''''''''''''''''''''''''''''''''''''''''''''''''' These versioned machines have been supported for a period of more than 6 years. diff --git a/hw/arm/virt.c b/hw/arm/virt.c index dd44fb30773..ae331df9349 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3525,13 +3525,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)