From patchwork Fri May 2 18:56:33 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: 886641 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp962042wrq; Fri, 2 May 2025 12:00:50 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUQFMrCGm6pp/O34hP1i+2yLAVBlNYh3Uq3LNFKUvrdijBhXd9ZHFi6oebbfHvDfQrxP3PdzA==@linaro.org X-Google-Smtp-Source: AGHT+IFn+jaCIheDYugzBHr0K2H2uTTUME4UNw6ZfAFgI1TFKNfOzgMbMz7najYnLneV181Fxj88 X-Received: by 2002:a05:622a:5516:b0:476:8f90:b5b1 with SMTP id d75a77b69052e-48c31b1a7c0mr60185601cf.25.1746212450384; Fri, 02 May 2025 12:00:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746212450; cv=none; d=google.com; s=arc-20240605; b=QGSwWd6g1Z/cMJmmAluiJ6MFvxuERQtsZxyHVG4wuhClQOwVh89kTZ/gY833snXieG pOKfJ7JlQQI/Y4C0hUMTek4rfZ2tT+KWkYNfHvu5W3BByoIj0ICiAGNNHh/nDFi3fSva E+atOs8WLWEmQqWn/4UgwyEs9UeyEeA0jf4V8pK0H1YQJzqrWjT1x7j0J81TUe+wnQzd IhBAUjHf8tV6RbNC3cuxXvJhgiCp02FoflMG2b6eG6v+hxJ842cpCqZnWu0FwGTbtil+ te8FjS1Hj9QdYqQMhY0XH2O0oFiLTrMjWn+INTZ8yl0j8Iy93kqs4xq4s9VdMq5dyRPk G8CA== 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=QsChSFQ9xfBFOGYiAY/gUqNa+0g2ne7rXsTx8MOyPRo=; fh=zA7MiWWYdZ7nPYzFPsisQ1XfjLk8wRfRNbrxI2kr3EE=; b=EaqMP8qy/YKzNpvuC1r+5v3ALklZLXfDsn8DLXBZmvzmJ73dUxRSCOMNy4oqDgstxQ mxQ08s8+63sYCeDHvJOlLDHj1q7AR2/TXXXqytQne2ulZ4lvrFIHK49wLGIQXfCU/qIs IiFoAMGgjoMc8YuU8r5NxWB3l9y3ZwFmB1Xw/TbdgxZEz8UY6VGZJNnKFUxdUpXDAcYu nfEnsntS3NSD7NVIwMz41S1ro6Moc8FHgRuFLtWlMilTnN/VPb0FCDCj//kjEOj2QSwK nmtPVO/WjTrzDZaviSaRo8PxvV4kldF/u5Jmxe7fQE+UEqOpS+r71VIzDiTON1Lw8ghc LYAA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Bgc1uVyY; 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-48b98733a3bsi35825101cf.358.2025.05.02.12.00.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 02 May 2025 12:00:50 -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=Bgc1uVyY; 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 1uAvZO-0004Y7-1W; Fri, 02 May 2025 14:57:10 -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 1uAvZL-0004V9-2U for qemu-devel@nongnu.org; Fri, 02 May 2025 14:57:07 -0400 Received: from mail-ej1-x630.google.com ([2a00:1450:4864:20::630]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAvZI-0005NF-Oi for qemu-devel@nongnu.org; Fri, 02 May 2025 14:57:06 -0400 Received: by mail-ej1-x630.google.com with SMTP id a640c23a62f3a-ac2bb7ca40bso383187866b.3 for ; Fri, 02 May 2025 11:57:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746212221; x=1746817021; 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=QsChSFQ9xfBFOGYiAY/gUqNa+0g2ne7rXsTx8MOyPRo=; b=Bgc1uVyYUOUEHezKlKDYH+y728lkzwupDdOXAJWjYdIBtRY5xmLGTl8oh00deIInao 8NmFVSCwR+g/8G0W+25rGHOfx3QnHG1f3Xww9141M3gR/s559dvTkkTjigs0DO+zSrIY 9r0E/RCAoESk6Q5b52an/VZvb3Ez9DfYY2jZJC3OqbeqFw3evJRotARHRPxahsck46Ve dwZrC45xnPTHOAPb3oGTFDU1KFOeG6j/sYU7Swrxlw93thd+SMzT2ZkP4eKT5kTK+lWY YtlxgGKm21SQBuKFfITYS+ZZ9Kn6CNgSVKEe5OwxCbIY9IcDttX4WMYTN4NIGNA3+6Fd fDUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746212221; x=1746817021; 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=QsChSFQ9xfBFOGYiAY/gUqNa+0g2ne7rXsTx8MOyPRo=; b=D8JcST/aAmR+HspwKGH0WZ/IXeshgir5UZUecNu3lMUeRdkYoJHJZc7vceG/2ALFKV JdA6ebwaoOjMKkJgz7JZI0TTK9+v9IqGVnsHD0eFu/PqJJG4MyEchuNGpLM166Y7oGnh anh+raqreYFS5Bts96J01d8u4mxGsZrBMI+0pvl4DSf/m0eeSERNDiekg9LYrS1+RIkY BYgluQVXvuK7zPCjNg6Fl8LwIS59dRAFL8KZowIedyTqXa3vCngJneYg17eLxLsq/lVd 0E7a4pkKVbfIbxPySiLK9AiZh5OmxbBsL/0ZjiIAaOyJaeOyBgB55Czf9AarXKUWVqGc yznA== X-Gm-Message-State: AOJu0YzWMFtjD5qd0Gcv0UnAKZuE+gNnpACUKBZTSutxy1gxnskHelNh vbzBP9zxxogrzimUzjphhw8BZpivBl6yu4diP0G3dTC3jHSgm3aqVZz6QfEwm7UG3n72U8mTArV r X-Gm-Gg: ASbGncvJDAOlTcOm/74Ilf4YGMj+gMj/WGCDMxJlrQRDEW2vmonf9P+g3gPMP5Y3D7U 2KLWm9frAiu8UiDIZPOLm8882jK/vOVvh06LygQRU7JARhoCq0SqWL4BWN/Wkd6fIIJtv6HIC7D KoFcJEzBlJ0iqQwQzMMpGuSW9rxJposRm42OAeDwI4w4Azy2VZvtqpj/lcKdpjDqUBSjygrXnnl 6gT3/d3+ItUI5h7yK1zCoUVbU7AEtjoA7rl974+QDjYSYudm1+utbwccJTnQM7KZUWXxygXtf1/ opWx8Lsjd3VReNgMedLT5sANFMzFq1gn5OmRTd/375tfPE8z85AKpPjs1ZTBzUejQYIJxtcnxbn 5PjNlXoKKhsPmEUIVtBRo X-Received: by 2002:a17:907:7287:b0:ace:ca87:2306 with SMTP id a640c23a62f3a-ad17b5f27damr382895366b.34.1746212220734; Fri, 02 May 2025 11:57: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 a640c23a62f3a-ad1894c29d3sm84586166b.113.2025.05.02.11.56.59 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 02 May 2025 11:57:00 -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 01/19] hw/i386/pc: Remove deprecated pc-q35-2.6 and pc-i440fx-2.6 machines Date: Fri, 2 May 2025 20:56:33 +0200 Message-ID: <20250502185652.67370-2-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::630; envelope-from=philmd@linaro.org; helo=mail-ej1-x630.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 | 14 -------------- hw/i386/pc_q35.c | 14 -------------- 2 files changed, 28 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 7a62bb06500..98a118fd4a0 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -764,20 +764,6 @@ static void pc_i440fx_machine_2_7_options(MachineClass *m) DEFINE_I440FX_MACHINE(2, 7); -static void pc_i440fx_machine_2_6_options(MachineClass *m) -{ - X86MachineClass *x86mc = X86_MACHINE_CLASS(m); - PCMachineClass *pcmc = PC_MACHINE_CLASS(m); - - pc_i440fx_machine_2_7_options(m); - pcmc->legacy_cpu_hotplug = true; - x86mc->fwcfg_dma_enabled = false; - compat_props_add(m->compat_props, hw_compat_2_6, hw_compat_2_6_len); - compat_props_add(m->compat_props, pc_compat_2_6, pc_compat_2_6_len); -} - -DEFINE_I440FX_MACHINE(2, 6); - #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 33211b1876f..b7ffb5f1216 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -658,17 +658,3 @@ static void pc_q35_machine_2_7_options(MachineClass *m) } DEFINE_Q35_MACHINE(2, 7); - -static void pc_q35_machine_2_6_options(MachineClass *m) -{ - X86MachineClass *x86mc = X86_MACHINE_CLASS(m); - PCMachineClass *pcmc = PC_MACHINE_CLASS(m); - - pc_q35_machine_2_7_options(m); - pcmc->legacy_cpu_hotplug = true; - x86mc->fwcfg_dma_enabled = false; - compat_props_add(m->compat_props, hw_compat_2_6, hw_compat_2_6_len); - compat_props_add(m->compat_props, pc_compat_2_6, pc_compat_2_6_len); -} - -DEFINE_Q35_MACHINE(2, 6);