From patchwork Thu May 1 22:35:21 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: 886452 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp541586wrq; Thu, 1 May 2025 15:37:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUMo+51tHZ+dqZaA5QXrBz7tICMTFAsOpcQq+Vn64+8vr9XH3AompjwTO8TcDqRSm7s5qsSrQ==@linaro.org X-Google-Smtp-Source: AGHT+IGNSBw/WaL28O0GKnZKdt0AT5zIWBNRexsK2/MTJZp+Lr8FWsY1b82p1y5x7Vo9wcX3BbMS X-Received: by 2002:a05:620a:280c:b0:7c7:b4aa:85bc with SMTP id af79cd13be357-7cad5b37e36mr109164485a.17.1746139027101; Thu, 01 May 2025 15:37:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746139027; cv=none; d=google.com; s=arc-20240605; b=IXxBQB2SCRkSyZFs4nX+urJEzm42buxAWzaJKWDbEjo+Fll4P93AX3h1YzfLCn8l0+ JQE2MRgTVqiXem7w0exNuevWkNi7h19r/1md/6IdxxEfWmq0tC0gfZyXrmevFekE1RMK OkVOGZSHuCcOL0O9lRJeawaYR6X32FZFk8ebpw0Lb7n/NyooA0JyuHh9WfnFKYOfqotF 89jGjixFiofAkva9DYMs6li+fW2dohBKqQatbZsdMEcKj9DX9tirXRdqM8V82YF5M8LE KNGBDaGFMUtk+NGYOCp5avFhXM3UYGfIzivCs44U0Bz+o9UAmDb/7IMtpcPIBYnsqvru aGbg== 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=+8As/hKAjswxkqY1TECVvJ6P3zOc3craDH105h0De0I=; fh=bJjaKaMQ3HkEGNz85aJeNaUi4jU+Dhz74OfPoi7UmSk=; b=k0FUmOpdH2NvEL4H9vBMBZT37SoGIxQ7xcnV1wftDd/kZxuGtTdBZ9PeYCFFqQdC7Q uN06iK8lKHOyzHzqHwHaMECrysfoSCb66sRJqHVTsOu+PVQ6Qki/s3m6qRzuXLLJD0Wi m7F+aGWTH3q8yX9GsZvWSvQL6SNLrMywFr8dvkn8yZiprHrH+WEL/z0JF9Fx/AVnTEVy ucrKbEX/JrbxTCPrxRYEmcDuGwi1NZnz8RYUSdd1lnqcVtnNHJq6tOl0eXMj7Kdkn8JT 9ITSky5l20D3JcUu4OshW11vTzGpJmk82SQwpFhBkYR+N+QO9xQuzdNdZxuwDSu7BW4b t4uw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=S86CeXL9; 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-7cad23c8d7esi168249785a.139.2025.05.01.15.37.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 15:37:07 -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=S86CeXL9; 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 1uAcW5-0002ej-0T; Thu, 01 May 2025 18:36:29 -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 1uAcVw-0002OQ-Pq for qemu-devel@nongnu.org; Thu, 01 May 2025 18:36:21 -0400 Received: from mail-il1-x12a.google.com ([2607:f8b0:4864:20::12a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAcVv-00030p-5X for qemu-devel@nongnu.org; Thu, 01 May 2025 18:36:20 -0400 Received: by mail-il1-x12a.google.com with SMTP id e9e14a558f8ab-3d8e9f26b96so12001695ab.1 for ; Thu, 01 May 2025 15:36:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746138977; x=1746743777; 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=+8As/hKAjswxkqY1TECVvJ6P3zOc3craDH105h0De0I=; b=S86CeXL9+qJ1Y1d+Dm5gQBD6M4OeMM8QdIShj8CHqfntGysZXixq52Ixko5xrt4Nch 5cKBhYaGRVpNEo0yQMerQxfe8otUcuMraCA3xvHN+tQd36ycucmf18g+DYQ2y/RHlPdV 25h7p4LPfteh3M6ez8kmSauchcn5/fZzzcpQr5IhNxRc/PMj48FQpdI+/E6yrmbaYlOv 0mZfWWYLNSw8uNuPZ/BhmVSzVEVOuJLZ0TSV823uvDJb8x426m1WRvqzy8jdHdzn7GID h9sgtTAdPPRGQ/I6N23i1SEg0IfIQzsEZu9gJVoDv069L5jx4n6J4DeHkK5i0sYYpw17 VEmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746138977; x=1746743777; 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=+8As/hKAjswxkqY1TECVvJ6P3zOc3craDH105h0De0I=; b=O8G2pIzth4+/f92XeEEuocp9UoSeuqOVz6Bh9lUFBX/o//d72DhNrPooVH3twQ/xK6 e4YYiMYucr4SztTla1bm3XUxodTbuVq1+nzJ6UC1OJNzJB5YK5pQqUxPs5P+Y6uI0xfO 9e7gM2pOg0sJVshDU3Lax9u9sP07ssF26eaAIaSpgoJyr4wOh9ECP4NwNSHcxwFe0JzU gAryriPleX3yH+51s2vpWGTxZxjqcVZ+W9P6KmitmHR7rXRdVuyhVyTey6Va6f3a8yYw 4VoOiIqJw9U/5IL/+OaV1xY4yRr4g51I35S5PdxRT8cJ/SqJxDtAfIczRo/P3SRHtw/9 w3nw== X-Gm-Message-State: AOJu0Yz82QVMj6Xf63oZNPnxaSMc+x8Un2CEZGDduk2dDPg95ZS4YMI3 wxpdPcVz0tbhuR/FZ3x2+DqcA4UZd+ofq/eckaa+OneBTDuLgPr1HyNktLoMDkQt6yPtXKWnCqh G X-Gm-Gg: ASbGncsK5J18GO7hwqtJRUoAdh4gXzsfyR6RtlH5RJZnhllIpXJcfaIp56rTVC4dWS6 PaPpNoYTNmW2SNcuTLP0XghWkPKVolUER1C6PDEUo3ZQjnYKEQVy4YYsbUInvpAyjU/2fy3ihce UVqUybHMWwLBwSyGpLj5MMimiDbqRkcNeGfJtwvIzCIjNx9CNJqn7w3BBVkS998ek1DlK/X+QQd XfkXxraiXQ8aqI0gvN+nnVCr72Wexw3/8rql6ET6nWSbxRrmX1rOhcp1w9LivieYKEQF3+ZoOyE BJZHOE3zSRLca5FOF8gb1bVwJfz7IOPW35zoyr9wyoPnyeQcgCTo+VIkI5WkdupI5w6eLZ+zqON tUAYWNFAO2VPV9yFpo1u2 X-Received: by 2002:a05:6e02:188e:b0:3d9:6485:3a03 with SMTP id e9e14a558f8ab-3d97c155cbemr8558535ab.4.1746138977118; Thu, 01 May 2025 15:36:17 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-3d975f58f41sm3326465ab.49.2025.05.01.15.36.15 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 15:36:16 -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 7/8] hw/i386/pc: Remove deprecated pc-q35-2.12 and pc-i440fx-2.12 machines Date: Fri, 2 May 2025 00:35:21 +0200 Message-ID: <20250501223522.99772-8-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::12a; envelope-from=philmd@linaro.org; helo=mail-il1-x12a.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 | 9 --------- hw/i386/pc_q35.c | 9 --------- 2 files changed, 18 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 4de84bce8ef..a8fda35bb9b 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -709,15 +709,6 @@ static void pc_i440fx_machine_3_0_options(MachineClass *m) DEFINE_I440FX_MACHINE(3, 0); -static void pc_i440fx_machine_2_12_options(MachineClass *m) -{ - pc_i440fx_machine_3_0_options(m); - compat_props_add(m->compat_props, hw_compat_2_12, hw_compat_2_12_len); - compat_props_add(m->compat_props, pc_compat_2_12, pc_compat_2_12_len); -} - -DEFINE_I440FX_MACHINE(2, 12); - #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 4839e8c5731..0c7b407952c 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -601,12 +601,3 @@ static void pc_q35_machine_3_0_options(MachineClass *m) } DEFINE_Q35_MACHINE(3, 0); - -static void pc_q35_machine_2_12_options(MachineClass *m) -{ - pc_q35_machine_3_0_options(m); - compat_props_add(m->compat_props, hw_compat_2_12, hw_compat_2_12_len); - compat_props_add(m->compat_props, pc_compat_2_12, pc_compat_2_12_len); -} - -DEFINE_Q35_MACHINE(2, 12);