From patchwork Thu May 1 22:35:15 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: 886448 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp541406wrq; Thu, 1 May 2025 15:36:24 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVx37mlRKX2WZ54N2YbOgwnFdzQmnH1QiuwJz6k8bqv5w65g85jBZl2R1pnWyI+Ikh14Qx61w==@linaro.org X-Google-Smtp-Source: AGHT+IG3rnNvVG1ITGljR8tuOD4t+4O+1pgWnSMF5kMHwVvxwLkZxNwnUIX+dD0ZLuHyPd5JBv3H X-Received: by 2002:ad4:5d4a:0:b0:6f4:ca4f:43f8 with SMTP id 6a1803df08f44-6f5152625b2mr14564766d6.6.1746138983794; Thu, 01 May 2025 15:36:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746138983; cv=none; d=google.com; s=arc-20240605; b=VMfZqZeVNI1fU++rgufktjqVnzjEdJonJJ/VrR/m6O5xd7g2IWqUGjmAgAq2zM4J88 3M7W96xBBp9Rx+nPSGrO4c9ePYRKQ2SuNyS530z7mk4Ml0v8VBBvZCo6hTlWt2GzjMbX JZZYviF/OOJHGasCTp918trM1Ky+2rj9mdpy83TvAm18j6+Rslc5F7lcZalowQa9Sqf+ Eh9v0KQqpoIr8bITKQz/ntYpQJqgLALbHSUoBNujDsiTjGMh0+NvyA9ZkSEhPeKWCfeW vU2NWzp8kpu9OumfwXcCcqwTs8Ohfl4VYULiKZR2efbaZ4I4a7+2nIYilJ0X7sQ1afGg XxbQ== 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=7fMEL/bKEw56xzMAth9BU+Ho0n9YaM0fXYJdD76Bau4=; fh=bJjaKaMQ3HkEGNz85aJeNaUi4jU+Dhz74OfPoi7UmSk=; b=GtZfir87/bO9iDIma5ROg7YtPctSuYBfoJ4sr8MHRWlFe2gguugkg96oSS24tXghFi IjZKTGnP1Ukd9JBjlGVgrK7CUZXpEfmcL8I9PDN8S8JWuHLzI3iX0ugpsoHGoHppST69 DIKI/Z/t9ILlITVQ2WlqiYsxtNGfRpQXZ+iKwgnJAiGE3objovYVzyiBDFR/yNq9QTOo lini2mzkIRtQbyxNEcHj9sPbfdRER8YdtgcKmHYwvQ1uqGe7GWT6pEWg9UO7A6ZNM3IT 5SBBrjHsqaLMURaEMmho8MtoCu6xhz/EpL9aNW9yKkf8Z/c6+0PnuL2WADsZiXv5Sfa2 jryQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EOQn7PDJ; 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-7cad23ba058si173734585a.35.2025.05.01.15.36.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 15:36:23 -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=EOQn7PDJ; 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 1uAcVK-000200-Gx; Thu, 01 May 2025 18:35: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 1uAcVH-0001z1-6V for qemu-devel@nongnu.org; Thu, 01 May 2025 18:35:39 -0400 Received: from mail-io1-xd35.google.com ([2607:f8b0:4864:20::d35]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAcVF-0002tF-CN for qemu-devel@nongnu.org; Thu, 01 May 2025 18:35:38 -0400 Received: by mail-io1-xd35.google.com with SMTP id ca18e2360f4ac-85d9a87660fso156762539f.1 for ; Thu, 01 May 2025 15:35:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746138934; x=1746743734; 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=7fMEL/bKEw56xzMAth9BU+Ho0n9YaM0fXYJdD76Bau4=; b=EOQn7PDJfjdczDon3Uy6VzDSo28yCyz5oY2oE4oWwtpr6ukt+c/OJLJ24o+SQXWlAL 7zEEVZASOWy+RrZkeaM0K0PX4lnLXGrwlY5UpSb6hKqsL+u/tfQm740IWoJWX/GJ9EH5 O5nLRYUunkoXP5xlHrTCewLB0GkMGfgUhBujLsj3O9NiBgOY/JjhRWHw8PAzy5DaneRZ vhMgskuw7PjcJHDgegY2F92zaLEc/I/qcp07wKZzg8XYsmOY/FMqm4D5CWMyvJR0Cy4V 2bCdbHa5gF7dC25uWSAiX5vXbce0wSfXWsn9lXbI76SeUHqUMP3iPAvYPhZn8fwwg2zG TqBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746138934; x=1746743734; 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=7fMEL/bKEw56xzMAth9BU+Ho0n9YaM0fXYJdD76Bau4=; b=pTPKDD0CIeLz9vdGySgKi9fTlPn5w5uek9V3Td4+qsE3tuZrzQAxB/kURxjIER11i/ J9tfv39oSqYPj9Psa5cav7ZUwHKshorCGKSPSatq1ee5YF+nFCe26L7YZdha0vilA+bN k9G6TmTpxt4AgCqnNGShPkfFhzoy0N9YnXcjCQmdUOC+hK8H7wsBmQt1PaLaeSr28jsd uLh9WwKklQw5Liwf3ZjEsVwMesfyk4CDWSB7EpPHBCGxSNNTYsst2Ej3ejBMHZd4XQIu fZhm5cXtRhOrW3n+Iqc5O0136DtmOFqhkCFNrX1TexVAvxyAVSG52ZsSCHQJo/WCd3/8 V44w== X-Gm-Message-State: AOJu0YwqiV4e3AWvgEVXF1tlg7HX+vuTbUHCjdpq4pWNu0lSG8OlKjVX NDpX92O1/mqji3k5/vv3K7+GtFRkqd7dMzPVbcHcIULwVTB0J1UNt2WTU/hY0qP0gl8MkDSsCDf Q X-Gm-Gg: ASbGnctJNwe2uecWRTzUI0aQ+v/JZKUqq9Ww0DvdIDpD08rMycPW6gW/9bvbPImyRzq QJQSvlQ0uESNoSgDeHCFOqvHmPTJ6fLYYIHIpEKFiFVAqAqdjHLfU/CoJF5Kcc6ojM3qnevtnxk 8y0iJBgZP37Tlsxcq/KaIEerxLlWHq2bA7O7iqEtTzkxeB+N2HX8a9CaH15thUi7DV5DSO3CXBe HoGZ0JnzeEp4CzadWCvSFEuJNHWoPAlhxMKCFuxDHd7jQ1y7Q+4U7Ql4UO54sZigLV+L1+DmGk8 hxE3VcB/mBX7qU9i5n2/6PYsPBrBjJobbSA00eCnQWLYtwq372UkcMgB7gPgAASt03hT6m+gSQv AHK3QJu9mQA1A8GR9EUztj/i0XYI2ymU= X-Received: by 2002:a05:6602:408e:b0:85b:35b1:53b4 with SMTP id ca18e2360f4ac-866b4434281mr153935239f.12.1746138934655; Thu, 01 May 2025 15:35:34 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ca18e2360f4ac-864aa43a977sm27633739f.32.2025.05.01.15.35.31 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 15:35:33 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Marcel Apfelbaum , "Michael S. Tsirkin" , Thomas Huth , Eduardo Habkost , Richard Henderson , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 1/8] hw/i386/pc: Remove deprecated pc-q35-2.10 and pc-i440fx-2.10 machines Date: Fri, 2 May 2025 00:35:15 +0200 Message-ID: <20250501223522.99772-2-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250501223522.99772-1-philmd@linaro.org> References: <20250501223522.99772-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::d35; envelope-from=philmd@linaro.org; helo=mail-io1-xd35.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 These 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") they can now be removed. Signed-off-by: Philippe Mathieu-Daudé --- hw/i386/pc_piix.c | 10 ---------- hw/i386/pc_q35.c | 10 ---------- 2 files changed, 20 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 5c7d0c50f8e..f0f71de4405 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -727,16 +727,6 @@ static void pc_i440fx_machine_2_11_options(MachineClass *m) DEFINE_I440FX_MACHINE(2, 11); -static void pc_i440fx_machine_2_10_options(MachineClass *m) -{ - pc_i440fx_machine_2_11_options(m); - compat_props_add(m->compat_props, hw_compat_2_10, hw_compat_2_10_len); - compat_props_add(m->compat_props, pc_compat_2_10, pc_compat_2_10_len); - m->auto_enable_numa_with_memhp = false; -} - -DEFINE_I440FX_MACHINE(2, 10); - #ifdef CONFIG_ISAPC static void isapc_machine_options(MachineClass *m) { diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index d66d64b3b62..1bbf2385431 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -620,13 +620,3 @@ static void pc_q35_machine_2_11_options(MachineClass *m) } DEFINE_Q35_MACHINE(2, 11); - -static void pc_q35_machine_2_10_options(MachineClass *m) -{ - pc_q35_machine_2_11_options(m); - compat_props_add(m->compat_props, hw_compat_2_10, hw_compat_2_10_len); - compat_props_add(m->compat_props, pc_compat_2_10, pc_compat_2_10_len); - m->auto_enable_numa_with_memhp = false; -} - -DEFINE_Q35_MACHINE(2, 10);