From patchwork Fri May 2 18:56:43 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: 886639 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp961975wrq; Fri, 2 May 2025 12:00:45 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXPeWLfvoES8jtVJa4DGlHb+9GJnXaQBfbqOPW9r10FX/G+cJVsMdf9u+eGHjQKHp8/UbViuA==@linaro.org X-Google-Smtp-Source: AGHT+IFEf96F5NGXd+pYwcOMDA7T36T7fIF3abZ1PzxQeu1oD7e+wPFFMg6N4oq8RnBI/Psr39bf X-Received: by 2002:a05:6214:f2f:b0:6f4:c63e:4cdc with SMTP id 6a1803df08f44-6f52363b728mr3338216d6.0.1746212445677; Fri, 02 May 2025 12:00:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746212445; cv=none; d=google.com; s=arc-20240605; b=ecyv2vGxOGE7JF6RN+12z1Jki+KiupiPkryM/GkSIo/RTAsrZ81LiCCq8N3f6N7Gqq vixHJpI86gWgUwPCObXKPDoNirPmKiyij31hZoF6GB2M9bpTGiRXAJOZXGH4/f8S0BXa ydiMZtJN0aFuZVqZpsXO1+HE/RWdKBJ/gc/AZW3NfClabxvM2MefbBEU2AIe+V5SHEmD XGGWXVxXemoG+qQTG1O3c0a7HUmzpJoRY/rMHydjYJ/87jGuuuBS2Xk2GklPCAG0nQVP uatJA5JrSEiKvqr+U/jCLCX7dDpZQ4UJHRjS6VYdGE7vYTv27jWtUBytYbzEsFmN5YWI Qcyg== 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=Ym7wSrcTG0iPDZDcZJp5AGoZOnw5NMHUmUvpm+lkeJQ=; fh=zA7MiWWYdZ7nPYzFPsisQ1XfjLk8wRfRNbrxI2kr3EE=; b=cVbmrSKn7+2ycGp+qhNuJInNhHR3pweRZyiaEn4TGwbAwMTkoZHBH47hDQN4qct2ue 8QE+hzQfel+BScuAvUbj00TnFHSvb3ZdPU9/I5oMgD0fbGqHyfs7RBYYc3QporafLNfo DxnLuAwsUJA1gmX0FDChHW9k1Q6mHm2OuzQ2PYX54xLdEeehH9tciAPboD3ReDbtb4u9 6VMIWyxxX11rL1ZaeOThNM+qwj3YMYOb3gDDwY5JVCJ3B+xU4KvHexTeHtDCqKi7tBBJ G9soaLkMipQCagsrQ9iG62sdrto+gjxQFj/l2CrKXadYC5+jn3wHaXXkNFAA9qUuSNwr vAGw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jqKnH5p6; 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-6f50f4aa111si36377336d6.374.2025.05.02.12.00.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 02 May 2025 12:00: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=jqKnH5p6; 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 1uAvaq-0007HJ-TD; Fri, 02 May 2025 14:58:41 -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 1uAvaH-0005xO-7J for qemu-devel@nongnu.org; Fri, 02 May 2025 14:58:16 -0400 Received: from mail-ed1-x533.google.com ([2a00:1450:4864:20::533]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAvaF-0005ai-2a for qemu-devel@nongnu.org; Fri, 02 May 2025 14:58:04 -0400 Received: by mail-ed1-x533.google.com with SMTP id 4fb4d7f45d1cf-5e677f59438so3549542a12.2 for ; Fri, 02 May 2025 11:58:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746212280; x=1746817080; 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=Ym7wSrcTG0iPDZDcZJp5AGoZOnw5NMHUmUvpm+lkeJQ=; b=jqKnH5p6jrCCTxHr+PtCwz0R2xWUSSrSXO5d8xst2UsO0rDejyt/M4kLx60nYBhbC8 sXh5WBd73eZK6xcvY3wRwI7EEJ2Hef2RBATDOnhHscS+8HC6nshVTpcuTMmpFYr6tNhe o6SVwQ+lrTYiATwtXJKQzUk1w6t2OKPzraaMafaH7Cwd77JnbN0Th6PgrIUrxld2OW3o DlOzQ7zR12ynDaQRyA6I/1RR1B0uoXOwWD9MPxfzfzFkko9JN6N4+qzpb2dD3FATxYQG gaCp51GBkzuisuCvEqilqLfDWxCI26XqfvJAPx2wZxzu6cHJvFxxrfJ2aEA6rVY4tBvv 5Y5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746212280; x=1746817080; 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=Ym7wSrcTG0iPDZDcZJp5AGoZOnw5NMHUmUvpm+lkeJQ=; b=WFv2p83VoNYXBg/M6JkMEdFDyNrc8L5TVosOW2TIR8spaPc98GHxbvAfi6y1axS3/I xCSmAESb9Ck6p9OCoN7clDTmF/JlBoNpmjMIsihlcylemb9rlzaO8n8Y91Xw9LFnqq3d fC0HFZESfuff+fNnyz9HRLv3SwwEEWuE4EP9iZiGqHnn2lnGnmiecI87pOVLnQLxQb/Z beX8VUfO/lmUkICAESbFDzS1xa0E/buDNl1Q9iKBDfPHNQJwxR36RbjpnafswZcvMAQY d2jvUUnW+7g7HQugTnu88qAXPN4l8lYf3j1cnnnkSjAMJGfAmYbbfB7eI6WNDVkqYw5h Ffzw== X-Gm-Message-State: AOJu0YxSjMj4avRDjhOZSqEtnvUD2Ae5RdR7vZ5S183hg8QScS92koHE PNu8xjRZpMAfWQT3U8e9rVRB4CUpxJ5jpdec7nBv2N/yy5nU5qulIs/BLmTWfbcC2CLEu3KrnH5 J X-Gm-Gg: ASbGncsOFnLAKTMEz3tFPojUNImA9uD6chqHsdHqglMUkPUqH83gW7mnceDCKdFqCYV 2yAaoHkfAbnPpQw9Fn7jVHQSGVhSsvwdH3EAmY4YFYlc//tTTtuIETpqYK5vpEdvG/KawgfJ0Yn jUPZICdYv/t6G6fmYNmI8+cL2tcwxqhFCZiW3zZKbOwrP8pssOck2v97AdG2ej9tdArFdLY3P4/ 8xu63yg+PhjSjDse0tRDnmxHyb8vyRFqdccACd5IjjZRtta7TAFIEk27kbV2MJ4ns62EB139aAT GQ5uekAh3CbQcEuoBA6ZccfCKhyowsKnSDMU/PP+8/o4ICgW74S3qXzr9xp4RCyD6lnhpMt3GN3 IgKxgMre/TfnsucYRcMcU X-Received: by 2002:a50:c8c2:0:b0:5f8:357e:bb1 with SMTP id 4fb4d7f45d1cf-5fa788ed11dmr2890471a12.22.1746212280005; Fri, 02 May 2025 11:58:00 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5fa777c74acsm1637679a12.23.2025.05.02.11.57.56 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 02 May 2025 11:57:58 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Laurent Vivier , Igor Mammedov , Huacai Chen , Amit Shah , Marcel Apfelbaum , Sergio Lopez , Ani Sinha , Paolo Bonzini , Eduardo Habkost , Jiaxun Yang , Jason Wang , Richard Henderson , Yanan Wang , Gerd Hoffmann , =?utf-8?q?Cl=C3=A9ment_Mathieu--Drif?= , Zhao Liu , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Yi Liu , "Michael S. Tsirkin" , Mark Cave-Ayland Subject: [PATCH v3 11/19] hw/i386/pc: Remove deprecated pc-q35-2.7 and pc-i440fx-2.7 machines Date: Fri, 2 May 2025 20:56:43 +0200 Message-ID: <20250502185652.67370-12-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250502185652.67370-1-philmd@linaro.org> References: <20250502185652.67370-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::533; envelope-from=philmd@linaro.org; helo=mail-ed1-x533.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é Reviewed-by: Mark Cave-Ayland --- hw/i386/pc_piix.c | 9 --------- hw/i386/pc_q35.c | 10 ---------- 2 files changed, 19 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 98a118fd4a0..98bd8d0e67b 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -755,15 +755,6 @@ static void pc_i440fx_machine_2_8_options(MachineClass *m) DEFINE_I440FX_MACHINE(2, 8); -static void pc_i440fx_machine_2_7_options(MachineClass *m) -{ - pc_i440fx_machine_2_8_options(m); - compat_props_add(m->compat_props, hw_compat_2_7, hw_compat_2_7_len); - compat_props_add(m->compat_props, pc_compat_2_7, pc_compat_2_7_len); -} - -DEFINE_I440FX_MACHINE(2, 7); - #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 b7ffb5f1216..a1f46cd8f03 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -648,13 +648,3 @@ static void pc_q35_machine_2_8_options(MachineClass *m) } DEFINE_Q35_MACHINE(2, 8); - -static void pc_q35_machine_2_7_options(MachineClass *m) -{ - pc_q35_machine_2_8_options(m); - m->max_cpus = 255; - compat_props_add(m->compat_props, hw_compat_2_7, hw_compat_2_7_len); - compat_props_add(m->compat_props, pc_compat_2_7, pc_compat_2_7_len); -} - -DEFINE_Q35_MACHINE(2, 7);