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); From patchwork Thu May 1 22:35:16 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: 886447 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp541405wrq; Thu, 1 May 2025 15:36:23 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUiVojWqTq6L7xz4+KDsEni+3N9kdb5/NL8sfjuI0MjjGQnG1xf6dYS4VLbjH/2/avQKUK0CA==@linaro.org X-Google-Smtp-Source: AGHT+IGReBT8VvJq0qJHLFluqE2PvRM+AIkUBhfrhWMVTnaZrAElhfdVbAuX6Rp0a7yLgJCQIgaS X-Received: by 2002:a05:622a:1e0e:b0:476:9483:feaf with SMTP id d75a77b69052e-48c317385c6mr10891951cf.19.1746138983766; 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=an26TgaiHdlBsdhwTEVOQcIyOtPX0PhQwYtPbZ8vdvQvK1l0IFpgg04V1x8mpUX7dv mb+hoRYdPXw/cBnosZyzLmfdGwRVIFkHYypY8w02mdgFT+fak138IDkpHW4EqlhMsr0S r5umMP5U3QKJzcA7vIioyNZamfmSpX9SgYW3E2e3kqmUoV1ECbhzIiIEoB45zvLJUpK1 tyUlaKVUktTMaDxvASp2Z9LU8qreS2FCMEkmiXaSJg8n0fDcJ7b3om8Pk3iaKY5MQKSE 5f0QFUEEUuhvfKbnZM5NvxbsEc/OsFUkORpddAAZBHY4kujlQ9/pS8y0LtRXp3Cj27UQ jyvA== 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=iciK1Ov3CYYXIv04KWMi1cwVSHb7UpaXRa3iCf7VwYs=; fh=bJjaKaMQ3HkEGNz85aJeNaUi4jU+Dhz74OfPoi7UmSk=; b=alGfrVhR+H2w9QEiVReD9/wyQ+XKKPXVXGbPri0nd52DDkONYtPNILgNBJ6b+qmwcC +ta/J5wOJJBQnwdHIq0uYnO7hLUabj0ba0MoKGP8VIjxuCGBB+2U2fGctkhJSOhnYu9a lzjq3pvMF7r/a3D1How3OqTPp9+2RIIZJ3tuXSkwZ/+q/8/DYupNNyHLqEtjMpKyXNAk Bz8xsCkDEtnYow3BD1aBXZDO9SGsW/kUFmpxq7aDUBJxgB6RggId8aBLeanOmObQ9Ytf TUy3ChWdN5PgsgZn6GOvVWrzMKJFda+Bcikp5iTDZ5kaNWhSfAOGcj5zfxXdcqjCBWFM dqRA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=y8hmRsLg; 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-48b990fcc0dsi15969061cf.645.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=y8hmRsLg; 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 1uAcVS-000255-Ru; Thu, 01 May 2025 18:35:50 -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 1uAcVM-00020p-VB for qemu-devel@nongnu.org; Thu, 01 May 2025 18:35:46 -0400 Received: from mail-io1-xd2d.google.com ([2607:f8b0:4864:20::d2d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAcVL-0002u8-2a for qemu-devel@nongnu.org; Thu, 01 May 2025 18:35:44 -0400 Received: by mail-io1-xd2d.google.com with SMTP id ca18e2360f4ac-85dac9728cdso41573739f.0 for ; Thu, 01 May 2025 15:35:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746138942; x=1746743742; 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=iciK1Ov3CYYXIv04KWMi1cwVSHb7UpaXRa3iCf7VwYs=; b=y8hmRsLgfZoEFrl6qZmNo6i9N/Q5Fka5GLKCzc5/BhcjrjaJ/jhq8ezjrLCH1Eaclt jaHYi4IpE/4dNOOip6v84/Qv7RXE4BoEs4li5Ni8XSqvXFJFxiBz6tbFkna7K/0mqsvK SMKTxo0tETRm/qUMAQe/3Vr+YKAyyZWoM95PrrdANM3Hqs3Pq3ZQ+OMthzt1AmL1BzzQ Aru0i8eaaIvf7kjrLjC/4GHzCuSgL+nTwfO10ldKa8qg+LqVuYRtUHSKm+wiEuYduGMQ +SPWlTyGWmRgA7r1Avqeb85CLG3xmxknyyE4GdLLMp81v/8X20+lWbzmlFDv0KHVRJLj orLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746138942; x=1746743742; 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=iciK1Ov3CYYXIv04KWMi1cwVSHb7UpaXRa3iCf7VwYs=; b=QosDGGwZKAOoO6jgGC7iT4uswFijdC4+05F5ZPUASq2hopwFxwzopUSD6zNUbMgjdc xAJ7mlLRf9AZMVBtWMXwZZGh0vx+TToaFriQyD3+4m9Mmi7Ij++spRM40XXWdpZLJ90W WAwdNyOCDRkF0Touj70g6h9XzhqwlrAYKyzTjl2M7S2OhEcXya0EZ1YJRkhOmSeRsc6N CR04SxemE+fcga0kvRccW0CVNgzAWFT0efGA16t0JdhrlS2VANSOoIEWJBPaBrgMdUbR 3sndiY9zN/c7ciT+acUKrYfe0TN08pH71QNa5ub7Yg8fAfFOQ4uOJcJ4a/uEOZVaWBPY vt+A== X-Gm-Message-State: AOJu0YwQjIWXOxAc2d/H+Sj4o569X8KN8ob/vUDF/EEg73dmyU/aYynX vbkaxVq0WokmWC5TrLp6Up6ngeiNc/2N0z5wcT4kgVW0O+g1tDFcoF/yGb+l4OTyP74BI90+txN x X-Gm-Gg: ASbGncsO4Gz5swmDFvEFj7jrfJKzviFWcO8eaedJhvkzZxmzzhz/9K+m9Lnd6NrYHcm xYkyRT/ZA7Wcm3foZR0A3A04030nQHWzUAYNDcV5XEq33VVX+U4HI29NmW5THqdzk3WLym4QJLT XcHuboknuR9AEibyzrucMsy3JUI9qHndyqMSqoQS2/fuiOKm+hyMKO10aA8MBKqSKR7vCLvHmKx bYXWi9Qyrx6A0iYC22CMWh9lrG1P4g3rQIgkD2EoXB3K0RC2qosCS2cJXlUj0ivLhN+Ju9jc5/h W62HeCkoZHSYEMx2lCwornQWevl/+XswSOTW/fW3G0E3atsPjDOECUiI2QqDq+ufda7/rh7d3Ud oLM2g4BkgNZgFLuIjA93h X-Received: by 2002:a05:6e02:218c:b0:3d8:1b0b:c930 with SMTP id e9e14a558f8ab-3d97c129edbmr8841825ab.5.1746138941628; Thu, 01 May 2025 15:35:41 -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-3d975f58f5dsm3271765ab.57.2025.05.01.15.35.39 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 15:35:41 -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 2/8] hw/i386/pc: Remove pc_compat_2_10[] array Date: Fri, 2 May 2025 00:35:16 +0200 Message-ID: <20250501223522.99772-3-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::d2d; envelope-from=philmd@linaro.org; helo=mail-io1-xd2d.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 The pc_compat_2_10[] array was only used by the pc-q35-2.10 and pc-i440fx-2.10 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daudé --- include/hw/i386/pc.h | 3 --- hw/i386/pc.c | 7 ------- 2 files changed, 10 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 455b869cce9..c27ff262033 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -280,9 +280,6 @@ extern const size_t pc_compat_2_12_len; extern GlobalProperty pc_compat_2_11[]; extern const size_t pc_compat_2_11_len; -extern GlobalProperty pc_compat_2_10[]; -extern const size_t pc_compat_2_10_len; - #define DEFINE_PC_MACHINE(suffix, namestr, initfn, optsfn) \ static void pc_machine_##suffix##_class_init(ObjectClass *oc, \ const void *data) \ diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 298091932ab..d3e38cf9f92 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -220,13 +220,6 @@ GlobalProperty pc_compat_2_11[] = { }; const size_t pc_compat_2_11_len = G_N_ELEMENTS(pc_compat_2_11); -GlobalProperty pc_compat_2_10[] = { - { TYPE_X86_CPU, "x-hv-max-vps", "0x40" }, - { "i440FX-pcihost", "x-pci-hole64-fix", "off" }, - { "q35-pcihost", "x-pci-hole64-fix", "off" }, -}; -const size_t pc_compat_2_10_len = G_N_ELEMENTS(pc_compat_2_10); - /* * @PC_FW_DATA: * Size of the chunk of memory at the top of RAM for the BIOS ACPI tables From patchwork Thu May 1 22:35:17 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: 886450 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp541532wrq; Thu, 1 May 2025 15:36:55 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXmYVfNWP72Uzo4/OyGPGLxbA4HKDp4QDa15W/dNuPaWwX//pgoQnfYw4k1lWSXsizNtyeEOg==@linaro.org X-Google-Smtp-Source: AGHT+IHqSJydWLrbZmUMsGOSHTugyiMqbVNmyKF1nQ/eBsUUDRwjjOayzHTgjjOBN/rSexuEobIl X-Received: by 2002:a05:620a:4256:b0:7c7:5ad8:aece with SMTP id af79cd13be357-7cad5b4d65amr114438985a.25.1746139015572; Thu, 01 May 2025 15:36:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746139015; cv=none; d=google.com; s=arc-20240605; b=LBijZv58LWivp0TsaqA75Pvb6lyDMGGWiQFOb/HukJEV+28zQnXyvgM4BQ9AL3odV7 wBaCNNItHshU9vkvCumGf1yrLFt1zDHDIIlGIpi3Ono4HXVDs52vQE7mG53pRub5Rm7L FElynQllHndPlGGUrKCmtSxc+K2w9t+nEPsGcnPdoqO9/vokvlh2VnuFhflF6m8Yv2FG dSthHj8unhdwa9CTXIEDcWB2F4cqvwugG3i8+QxdXrRK/9i/iZouYJ/ukIzXlVTPozeh kdGo2KwqcTrtXv6blfZzPqUiq26m9+KuSoYuvCyGEtMejiYT7Ity6jjNLbHF55HpR6Rp gq2A== 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=AFO1UMQCD2kehJV4cZTH35nEl20cSobaxPC84Fy3YfY=; fh=bJjaKaMQ3HkEGNz85aJeNaUi4jU+Dhz74OfPoi7UmSk=; b=ACVqVbhy+t09rl0+tj1JLaD8qWYEo+CNO6iD7PbvgQ83TuM4y7zxhyubd9w8AS2TDE nQ2j8h8eJdKnWfUqVBrZlHy/ZDv9zm8Q6lYSi/KgXBJxNupoGPtDZ72UoJ+uG+k3SMRn EpIZn8RnLA1WzHQHHWAUmFHBlvxSyWzTrgGccQ7bea9CYelw+nOMbFk33WezLiuugUKe xOOHxPSTy0PZKXUqGdPpVJSRQBoMfxG5ZHuRGhsTtvqHBMQHjEL5QutzubSR15l8hpFP f0+pE1ZUZnS1cl8OXpED6H6sW9L/vksng9A9CIzq9cXw5tUV4c7khKD9kRwT9/nYa/dn bEIg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=l6NJlq9M; 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-7cad23bb395si173940785a.93.2025.05.01.15.36.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 15:36:55 -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=l6NJlq9M; 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 1uAcVW-00026j-Rt; Thu, 01 May 2025 18:35:54 -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 1uAcVU-00025m-IU for qemu-devel@nongnu.org; Thu, 01 May 2025 18:35:52 -0400 Received: from mail-il1-x131.google.com ([2607:f8b0:4864:20::131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAcVS-0002vU-M1 for qemu-devel@nongnu.org; Thu, 01 May 2025 18:35:52 -0400 Received: by mail-il1-x131.google.com with SMTP id e9e14a558f8ab-3d96d16b375so7893325ab.1 for ; Thu, 01 May 2025 15:35:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746138948; x=1746743748; 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=AFO1UMQCD2kehJV4cZTH35nEl20cSobaxPC84Fy3YfY=; b=l6NJlq9MoRoRaqEZf62nMzw2iwYM6nq+AjKtTmyyG7Yxvi4YRwkFRU6+ZhCf28+Uux BioTPtOnUXai75nGP9jeup5hhhoP35njFy/n66HEBqlPjUTb2efj4YKQLbZovE+QAHj/ UyBaPbaOLPW859vsNdFv9LuNz/1ANT+DShi71MJlFPrhoD5L1qEcEGh41otSg4U4v0bS E3/608K8IFqPagXZ35uIawrnSIntLzBZcehc8Jk/trz5/Z++JCEjM3Yc0hyCtnzZxmTZ 3ukMfMKPEziLqlXzY6pJU8fMO+hcQiX0//hNTfAuJDSt9WoPi2FBA2+JCccBPbun2Q58 iH7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746138948; x=1746743748; 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=AFO1UMQCD2kehJV4cZTH35nEl20cSobaxPC84Fy3YfY=; b=ClbMy1JAJlCjsQFMegpaAAmUD0rE0rEmYSnmSc0s9V+W8QJz4tw2v9F61IUNBitC4O yR+dX/4QDpipO5jY2HubxrrpgW1zTlDFxGa17ec3MdHlh9KAa4heJJdEmFzYKL3Wi16y hhh/GDIDF3zuVba6PZnQ7EjHSyb6EVmlcB8MeP2SJV+BE9ywM4UAgSV+mZ5W6k64/tM0 hluj35qxKJiRfdRUXvtZXHMkspBSr1a4FtWEdgxQG/ZYjTP/d7QDJNmRsFELr1DIJgkv x1xboiByUsHhxBNpMrVAdUTwVRXVlClikBGHZeTmQjcBso85XuQs7DQPowDc+UHsT9O6 6n2Q== X-Gm-Message-State: AOJu0YzNs6PnG55+h01sYaG+4vrccOsWOE7A+e6/FDdn9wUfy3NJFaaV lph8ztq2W1Y9Gpw/nNaspYPUgpsJbanwDFPW0I4p0dNhK+/osPuh3JhuyFy86JEQ/47FdLNbOIS d X-Gm-Gg: ASbGnctQ3WkqsqQhpwsrR77ELao75CemXcDnolU4yWqAulIizfVChX6xHRtFsxWKdc3 rLYyxlYR5Le9cWoMT266zuyzkQJNrN4CVFSnwYXRdjAyBOSqVyRvdbLVJ1C4iKmTMNLtkNXgB3O DxxdsfrMmqAHw31GKgbZhITRTVFpCVeOXZnM9N2PxMXRkDHa5UPLHV3EvuZxqe/bZkVTURs5Rym MPwTmcueJ2jOtIJVgxK4kRghwUrdeNmdIvtGCUZkq56RFK/oEMAp6cL7yZ5NweBcVUa0Z6dlYGq XCryeuzZVjiYtljvHk9uiO2NAY3Z6SeIQqGyj8cD5EaMpS0y2TL3GJiPwUBP5/1F05z1tbOnl53 R9RLgPLx33TD2FMP78fj3 X-Received: by 2002:a05:6e02:3a01:b0:3d9:4724:c687 with SMTP id e9e14a558f8ab-3d97c2393a8mr8991165ab.18.1746138948669; Thu, 01 May 2025 15:35:48 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4f88aa95febsm77770173.131.2025.05.01.15.35.46 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 15:35:48 -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 3/8] hw/pci-host/i440fx: Remove I440FXState::pci_hole64_fix field Date: Fri, 2 May 2025 00:35:17 +0200 Message-ID: <20250501223522.99772-4-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::131; envelope-from=philmd@linaro.org; helo=mail-il1-x131.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 The I440FXState::pci_hole64_fix boolean was only set in the pc_compat_2_10[] array, via the 'x-pci-hole64-fix=off' property. We removed all machines using that array, lets remove that property and all the code around it. Signed-off-by: Philippe Mathieu-Daudé --- hw/pci-host/i440fx.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/hw/pci-host/i440fx.c b/hw/pci-host/i440fx.c index e13bb1b53e4..8071972d04f 100644 --- a/hw/pci-host/i440fx.c +++ b/hw/pci-host/i440fx.c @@ -55,7 +55,6 @@ struct I440FXState { uint64_t below_4g_mem_size; uint64_t above_4g_mem_size; uint64_t pci_hole64_size; - bool pci_hole64_fix; char *pci_type; }; @@ -173,13 +172,12 @@ static void i440fx_pcihost_get_pci_hole_end(Object *obj, Visitor *v, static uint64_t i440fx_pcihost_get_pci_hole64_start_value(Object *obj) { PCIHostState *h = PCI_HOST_BRIDGE(obj); - I440FXState *s = I440FX_PCI_HOST_BRIDGE(obj); Range w64; uint64_t value; pci_bus_get_w64_range(h->bus, &w64); value = range_is_empty(&w64) ? 0 : range_lob(&w64); - if (!value && s->pci_hole64_fix) { + if (!value) { value = pc_pci_hole64_start(); } return value; @@ -213,7 +211,7 @@ static void i440fx_pcihost_get_pci_hole64_end(Object *obj, Visitor *v, pci_bus_get_w64_range(h->bus, &w64); value = range_is_empty(&w64) ? 0 : range_upb(&w64) + 1; hole64_end = ROUND_UP(hole64_start + s->pci_hole64_size, 1ULL << 30); - if (s->pci_hole64_fix && value < hole64_end) { + if (value < hole64_end) { value = hole64_end; } visit_type_uint64(v, name, &value, errp); @@ -360,7 +358,6 @@ static const Property i440fx_props[] = { below_4g_mem_size, 0), DEFINE_PROP_SIZE(PCI_HOST_ABOVE_4G_MEM_SIZE, I440FXState, above_4g_mem_size, 0), - DEFINE_PROP_BOOL("x-pci-hole64-fix", I440FXState, pci_hole64_fix, true), DEFINE_PROP_STRING(I440FX_HOST_PROP_PCI_TYPE, I440FXState, pci_type), }; From patchwork Thu May 1 22:35:18 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: 886446 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp541404wrq; Thu, 1 May 2025 15:36:23 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVKgQITndOdBwk31ETO+XGfXjEvO4/5x5HINVH6uWOci4h+Ui9dPVQbF5j1eWgT7cg5fFtwsw==@linaro.org X-Google-Smtp-Source: AGHT+IEvCeQEFWx0lNGqbLqtJk8U5LoZ6hiQN5VhCpXTzLDeQK4rwRr5guL7pVx77woPs5KAheXr X-Received: by 2002:a05:620a:254c:b0:7ca:c990:8fc7 with SMTP id af79cd13be357-7cad5b37e0cmr115273985a.18.1746138983633; 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=Q8jfu9ssj7Pxj6IhJn6CXg7cNHCSQ4N7kI/xyrOJPos+pCLSeeHU//FrXEuCtxpWP1 ocsF6BGGsCr9XoRr3Z3FguxcmlftTUMBU+UqDn+0C/l17p756NBROPecnZ8JykwXCEeL 6I2N/xNXwb6IjhKk9bGX1XtBjgRqgpwLVzszSRIAHy5hLhSqVaSrL529BHXdpnkzsah6 ZS91VInWkgICCBk9ZTRYhQyyB8dZ1hfj/vjdGVUuRYLKNL5apDoDxusxmX5kdfBnyMQd EBd0Nr0+TJ1VYS0gKw2BjZZh5P9iunXkCiUBh26qIrnU6qt5p/r9FjxYdrCuu6k/K/oM p7MA== 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=6mUzjya4/yrCYE5fBr0m8sscOfk57w9pos5S926FUF4=; fh=bJjaKaMQ3HkEGNz85aJeNaUi4jU+Dhz74OfPoi7UmSk=; b=EqmzRIa1pv6WC8nD+i2YI3wB/FMpBnfcW4el3ZThtqE9l29k92e3sCG51a2LkMERvg LKD/GT0dK7EZgy+4NoP47FM6VN9FpEx8zqHlXTSwBW5VINNTVK98IIiGLO+IxaS/KYkV EjmG0A5jHzolJCJf3fCh6UKAAt2Pj3XPZ5H2xpOCj2NoGtQZQek7M/Es31lgv6GK/vTD sGNhhiVmltCe9rEyVoZ9AzJdDkxNg4tIIDjE3mZkijefEDQ3i2Piu7J5UAc3/uyD1BZN XPe/PGY87wRlYFOQdQ/sbfDgXriB8E8CfZ5c1XnlEwv4HFnHxglPxS/ZISZWAhrUUFYp NTTw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=a0c3W5IH; 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-7cad241ffd6si171229285a.236.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=a0c3W5IH; 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 1uAcVf-0002EG-95; Thu, 01 May 2025 18:36:03 -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 1uAcVa-0002CM-Rv for qemu-devel@nongnu.org; Thu, 01 May 2025 18:35:58 -0400 Received: from mail-il1-x12b.google.com ([2607:f8b0:4864:20::12b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAcVZ-0002wu-CD for qemu-devel@nongnu.org; Thu, 01 May 2025 18:35:58 -0400 Received: by mail-il1-x12b.google.com with SMTP id e9e14a558f8ab-3d57143ee39so12997205ab.1 for ; Thu, 01 May 2025 15:35:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746138956; x=1746743756; 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=6mUzjya4/yrCYE5fBr0m8sscOfk57w9pos5S926FUF4=; b=a0c3W5IHuAMH85pADD4m/jUkG/eSfeogJORzmKpOFDGih7Hh4Ll5EmmKnW2Dj4HRvx 5oPiakGwopZrQ9yQPBtLHThA4ckdYWgKPAqmLBI+8Ia3GTizApacHGtym1ut1h1dKGU2 4imvYkQDGXu5nDQAz9QcHBn/dUMSlmlZfPAe/Rkcxrvb+u4b+yrPSN0X34kIK6uEziWW sB73gCS2Dy9/hm14aGAypVe9rqhSLXI/VwBI5ZZXPcV4K1aGlEsB3xM2ZsFrNQi2s7t0 WsIC/dIlNW1xYSI9GDpyXSinGKAFPYptV62TDjvWOfuG4L3rmP8SbKs1vOhVjHuj7sVM wJUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746138956; x=1746743756; 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=6mUzjya4/yrCYE5fBr0m8sscOfk57w9pos5S926FUF4=; b=WDm64AOyVQPzVwfRCZAgdaWeogaiNd2Sz0MgHGBsULHSBwQSJxGjqOkWng4XOwxMKd MmvrMzep94phPBIx3c2zLkATWxdShfkCZUwfcd4XwxhGnoMzWql8oEewlOCQNiMzOn+m jJhLVCl0IMbHE3e6gt5jpq6GtLiv4nVKcK1jtQRIRA00LM6Krqq9Z2qik8DjuTkgrI85 uKV1pic8EiLiUTOElQCpWU/ELIpZNwc+XY6ak8PjrpspMUBeeuO2TgbyN+QifNLkKGS2 bBJfTCm12qzS55TCYv7ewLtCxbl6bFCiO1EnyjTFtxJ57jDkY8jv6HaF8OJ+K7V2VqZg kUMw== X-Gm-Message-State: AOJu0Yxgnop5Tn0/rWMhywtBzST3ItVLs1ft5MmkHzldPDPrbp65Yy2d GfBeVQd8ug3kv/0e/EaCiG3wWUqc7vZnN0lxJRiHzMKkHmVIq7/fO2a7XeV+6Pn6ZjH2GIYCluY L X-Gm-Gg: ASbGncsbaYpMlc0h3RiBx+MqFjUcUfy/nqDDqAaU0JZKi9BBZoC+2Bwd368cYfXmSZH KJVOYonSRIOuvG41cHjqiX0C0KmrmmukYu0yHsTmcHfuYwNmOymPhE5DNK+RyWMHht/Nm2TtSz3 oKtEABUb+v5oemFBy2zG7sXWrKOznDPPEVOUewHei+Cq3etcHBqNljVkRKaHqMtb+u/lOEZopwJ H5njj7r5fQJqr5ObLcrPNIV98O6PG9k19bijNk6FMJV8U7t9vfNykKjoTn9wpoOTgYrz/NQr1yR HEDfOsAkSZDUacVvS4ZXYDhzyObfTr3ZJzjCzCVAFCsVkCiaxuJRVySybJdroOmPMZtABMiiUGC oYB2Z9+owEbronUKO67jE X-Received: by 2002:a05:6e02:2307:b0:3d9:2aa3:fe2e with SMTP id e9e14a558f8ab-3d97c184cbemr8165855ab.10.1746138955788; Thu, 01 May 2025 15:35:55 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4f88a9416edsm78326173.64.2025.05.01.15.35.53 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 15:35:55 -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 4/8] hw/pci-host/q35: Remove Q35PCIHost::pci_hole64_fix field Date: Fri, 2 May 2025 00:35:18 +0200 Message-ID: <20250501223522.99772-5-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::12b; envelope-from=philmd@linaro.org; helo=mail-il1-x12b.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 The Q35PCIHost::pci_hole64_fix boolean was only set in the pc_compat_2_10[] array, via the 'x-pci-hole64-fix=off' property. We removed all machines using that array, lets remove that property and all the code around it. Signed-off-by: Philippe Mathieu-Daudé --- include/hw/pci-host/q35.h | 1 - hw/pci-host/q35.c | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/include/hw/pci-host/q35.h b/include/hw/pci-host/q35.h index ddafc3f2e3d..75810528205 100644 --- a/include/hw/pci-host/q35.h +++ b/include/hw/pci-host/q35.h @@ -63,7 +63,6 @@ struct Q35PCIHost { PCIExpressHost parent_obj; /*< public >*/ - bool pci_hole64_fix; MCHPCIState mch; }; diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index 1951ae440cc..f6e29cc4fc8 100644 --- a/hw/pci-host/q35.c +++ b/hw/pci-host/q35.c @@ -116,13 +116,12 @@ static void q35_host_get_pci_hole_end(Object *obj, Visitor *v, static uint64_t q35_host_get_pci_hole64_start_value(Object *obj) { PCIHostState *h = PCI_HOST_BRIDGE(obj); - Q35PCIHost *s = Q35_HOST_DEVICE(obj); Range w64; uint64_t value; pci_bus_get_w64_range(h->bus, &w64); value = range_is_empty(&w64) ? 0 : range_lob(&w64); - if (!value && s->pci_hole64_fix) { + if (!value) { value = pc_pci_hole64_start(); } return value; @@ -156,7 +155,7 @@ static void q35_host_get_pci_hole64_end(Object *obj, Visitor *v, pci_bus_get_w64_range(h->bus, &w64); value = range_is_empty(&w64) ? 0 : range_upb(&w64) + 1; hole64_end = ROUND_UP(hole64_start + s->mch.pci_hole64_size, 1ULL << 30); - if (s->pci_hole64_fix && value < hole64_end) { + if (value < hole64_end) { value = hole64_end; } visit_type_uint64(v, name, &value, errp); @@ -181,7 +180,6 @@ static const Property q35_host_props[] = { mch.above_4g_mem_size, 0), DEFINE_PROP_BOOL(PCI_HOST_PROP_SMM_RANGES, Q35PCIHost, mch.has_smm_ranges, true), - DEFINE_PROP_BOOL("x-pci-hole64-fix", Q35PCIHost, pci_hole64_fix, true), }; static void q35_host_class_init(ObjectClass *klass, const void *data) From patchwork Thu May 1 22:35:19 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: 886451 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp541550wrq; Thu, 1 May 2025 15:37:01 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXJ0yRAmysnv+Gt9lro2k9sHOm9X4J4sKAFYC6pVluliVo29SUlfCQjEctsKVcZNHufaHer9A==@linaro.org X-Google-Smtp-Source: AGHT+IH9SCFtwJv9CGBt0QQVX8idN7l36RyoBN1tnGj3rSS5zxEX42h0ZuTKwbQpz+YDGm4Rvw0p X-Received: by 2002:a05:6214:20cc:b0:6e8:ff46:b33e with SMTP id 6a1803df08f44-6f5156135c3mr17529176d6.37.1746139021022; Thu, 01 May 2025 15:37:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746139021; cv=none; d=google.com; s=arc-20240605; b=hQqXtgK5c2gPNpLfwM+ZEC93Y9+HW/9yGySbeAuH2dfvl21MzXDA9b8i35nuea3A91 3ht35Je1XWrwnjT8S1re0PAUGd4Q/hs3EMmXdrdzeoFNE14NA5NPWBP8H1tMZ91CoGxY NsnpoWcyocStRzEddsmjzs7gHihijCCitgGDTSMeX/Ez99nrwSIjgLFtE0TdhH2PHcK4 0nCeDi054XIy497yQ3+iu9lFPA56OsswXC8Aeh4ulpLVhHBn5P51fj81nt7SqOjc0X+B ElXIYycO+tzQZIOBokykPNLryf8C+OaRLl7n4BqjGFka59Ia5yurgpmrnbVZoVnk0ZkQ Ff9w== 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=wNtrhN9YbjPg/7Nhp3PsvLWWauM2W8aWQIlB3BOayNg=; fh=bJjaKaMQ3HkEGNz85aJeNaUi4jU+Dhz74OfPoi7UmSk=; b=e8bl3zSVxiAaYNFKgTYpY8ZN28n8L/kua8ED9YjOF6aa7AYwxvGz9k4TAHFVu8U8Ha W4VQULFCGs72eqk+USJ0/2fZr/OwIfO5Pz2iMHjcscbkKXgJ3mKTSbWNsyb9fu/3R+lj ZCY4Qt7FH2tS3fy4s8Cz/h8NJaE+RoYb1+KU7dmVAQMBKqMPTDDwoSGpx+K6UQnIrfwk oa51MYap/zwxbE17w7iY7Vnv7nOgfNC0xMj8XvEXKSoB64ScMhruPW+C2Vcmxnjf01P8 lurw74uo2Ae0tQNhHnAwDa0gslEAoy1ab9vxB0en2c29D5LA/5NIlHwNoKmTvxIwMLkl nLYw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=w173QeWg; 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-6f50f3bf49fsi18304836d6.166.2025.05.01.15.37.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 15:37:01 -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=w173QeWg; 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 1uAcVm-0002Kf-SK; Thu, 01 May 2025 18:36: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 1uAcVi-0002Gb-Or for qemu-devel@nongnu.org; Thu, 01 May 2025 18:36:07 -0400 Received: from mail-il1-x136.google.com ([2607:f8b0:4864:20::136]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAcVh-0002yT-0G for qemu-devel@nongnu.org; Thu, 01 May 2025 18:36:06 -0400 Received: by mail-il1-x136.google.com with SMTP id e9e14a558f8ab-3d8020ba858so16215305ab.0 for ; Thu, 01 May 2025 15:36:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746138963; x=1746743763; 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=wNtrhN9YbjPg/7Nhp3PsvLWWauM2W8aWQIlB3BOayNg=; b=w173QeWglOYzvCY/Y/j1ATi2AYFD9uv2e46kyvg7Jz1b/lxiQcMTuOLVdSGmzQ74uu zLvjdAEu8AsJ3R0xKrEjOn72WdCiXVfDuEujHyX0WRPDUKqgNssefmjg9+GaxfCYlusc cSOzObLYyoIOrzzsUvGq1kYBheHHq9Cka342ufggtuizqrnG2AaEuCMNB66ib6m2lWvt xi8meb4cod+nFH3EUAd1yAWEEbRO081Pwtm9lBRGHiuKSc0NhtiDBVHSMeKWl351lYAl DUHINYsI9qp8xjdJMLK1nwsFEkHIdI8Q8Yaeyk5gQUVhLmATmvdsb9LF7DG61a68+81/ fiEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746138963; x=1746743763; 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=wNtrhN9YbjPg/7Nhp3PsvLWWauM2W8aWQIlB3BOayNg=; b=SlmHEdllhUeqNUIgqI75CJEaNFfK8nzU5AD62oZhGNHtOOqBLtr6QUmeF03zIZ+YG1 3edtX21HAio86F/pcahbn8IM2FAXAck6TvXXU7WrE8uQhMGdxA4Sl1RM86JLUNRIuPUm WqEArpwet3deV/03sg4wyM4h+b326ugq3yHkUOaID/TuwXwJcFIfKbXrMezUXT1xGIpm vtT8CJhc7v8B5U4VjqL42jY+bmRzIoqzXZgYB45GVe6lpH0CNti6g2d/2tAPGb2MTp5C 47Y3yoLMMFl0h9HfUx97wMBcB98787hJt081G/XYItgNH9sFXScUgv2Tf5T3qEPYrdtr iduA== X-Gm-Message-State: AOJu0YygWUUFmkCq07iEjqwcX/l9tEuSw47pNIjD6JZ77mrOZOjSxEnm t8soRFTd8i1ndsoh+T8H3FwymwBGlF8f4g7fwSveHtOvV8ZhsQIGyFfHLaM9GIxvaboQKIBnJqK H X-Gm-Gg: ASbGnctjnFcYrZZFlxXoTg8IjVnqOPR+k847YpQsHn5Xb//R7CXtsp8Tp3O7egDWMnX bdUTBvgrb0bF/xqH3OWX0UgaugxYO1fMXAcmlGJcDivCOZeVGBXr0lYKMWgwv12XgpKr6CtCecn vdNbXmuK9rid2vAs8QdEaEJOPpNyxTBBm60+Gp5a3kpDowyMnRyybMGIHy2+6YUJ4W5NXWq6mEk 2RhScqLZu1Xw1GQmJ0zPVYH7Ht9ANAZMOMsWlEeGMnsvXBaX7eiNx2u38T7M/WWy3jhsmdj62Lq dSEZjyKubLDSnknK3JhBhWx8CFwiC2XXb7nAtRB4rZ76BOwUNMjiHnm59fikcMEWMfzpCuGYhnQ c9kQJ51W2bj9i+YeXvb+1 X-Received: by 2002:a05:6e02:3387:b0:3d9:666f:486d with SMTP id e9e14a558f8ab-3d97c237decmr9904005ab.15.1746138962901; Thu, 01 May 2025 15:36:02 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4f88a916042sm80567173.40.2025.05.01.15.36.01 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 15:36:02 -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 5/8] hw/i386/pc: Remove deprecated pc-q35-2.11 and pc-i440fx-2.11 machines Date: Fri, 2 May 2025 00:35:19 +0200 Message-ID: <20250501223522.99772-6-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::136; envelope-from=philmd@linaro.org; helo=mail-il1-x136.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 | 10 ---------- 2 files changed, 19 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index f0f71de4405..4de84bce8ef 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -718,15 +718,6 @@ static void pc_i440fx_machine_2_12_options(MachineClass *m) DEFINE_I440FX_MACHINE(2, 12); -static void pc_i440fx_machine_2_11_options(MachineClass *m) -{ - pc_i440fx_machine_2_12_options(m); - compat_props_add(m->compat_props, hw_compat_2_11, hw_compat_2_11_len); - compat_props_add(m->compat_props, pc_compat_2_11, pc_compat_2_11_len); -} - -DEFINE_I440FX_MACHINE(2, 11); - #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 1bbf2385431..4839e8c5731 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -610,13 +610,3 @@ static void pc_q35_machine_2_12_options(MachineClass *m) } DEFINE_Q35_MACHINE(2, 12); - -static void pc_q35_machine_2_11_options(MachineClass *m) -{ - pc_q35_machine_2_12_options(m); - m->default_nic = "e1000"; - compat_props_add(m->compat_props, hw_compat_2_11, hw_compat_2_11_len); - compat_props_add(m->compat_props, pc_compat_2_11, pc_compat_2_11_len); -} - -DEFINE_Q35_MACHINE(2, 11); From patchwork Thu May 1 22:35:20 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: 886454 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp541623wrq; Thu, 1 May 2025 15:37:16 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUyk8Gs7+Bm0ozjK8vQHauWOSAmIOwq4X+HXgJ00ZI3TIRtfywWsT5nJCIyzKHpAh385fZpyA==@linaro.org X-Google-Smtp-Source: AGHT+IG20JaM41++bBLP97I0qJUTjNSI8cVlyh1vCB01rpTlz5UP7CMLStx/5HDGYIWOwO3pTzce X-Received: by 2002:a05:622a:59cc:b0:476:8e85:2a2f with SMTP id d75a77b69052e-48c315483bbmr12963781cf.20.1746139035831; Thu, 01 May 2025 15:37:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746139035; cv=none; d=google.com; s=arc-20240605; b=kF0RxkgUM2cqByaORhfeJf69uOz91qDPz3Kakr/cfyftFFWZXs5l1iRUTT4iOTaQhq 3jWWdFa2Ge5vSIof9S2fUvpDJZ9WLqHqciiJiaEnp+AtlWabYUK3zN52Dee9hSXVMjuO y3VHxMEHDq/J/F3gahpYFfO647nxqE+4t2tm5vr9QGSaS3PUirl/umTC2kYha8UsXjLg 6OfIQR9rT7k8s+GWWvrzkbT5H7zcHhPxQxu1wLTs0MGsTiMll94DABxSvAUhArPPx8L6 Zl5mkq01VKftyXKClIgsBACcaOe5jNxTwqcPvPMEXl94Y5IpQFQha8Co+S6Nb6gHDGn/ o26w== 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=kmhBmYebiRFz0OgzLtlxL2sc6it26EKxebtheKN6ZCc=; fh=bJjaKaMQ3HkEGNz85aJeNaUi4jU+Dhz74OfPoi7UmSk=; b=Fyy6UXR5Ftz6a40lXjrcCEf79HI0GeUE502NNRaKROJpAEpbFQK1YcrjpBW6oVWkoc wz/tq4dUJqXWZ+UIsQ72/B3Br0ehukFibaxzSUZfy9xREksRHD0RIcUM8FMKTuHvwRaX X4jXjsBiWH8vNGQxRwSX2SgtQlxYlTpF4Q9dzUIRme3CopIM7MmiRfppJW0SZLw9KGRN 0eroJKVAfzWTtvKU++xMoMe9/ldDAKwFXX/zyuyul/yf6H60Zzr9niXqA5NvxmXE4foN G6c1RouYm1FfIIOLcKJc4R9XwQBAKoLRrTFB5sSY0QnI2g4U4I3B1jFiC4YtRktu6sxk 1qTg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pwk5Oe2M; 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-48b960cffe0si16260461cf.28.2025.05.01.15.37.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 15:37:15 -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=pwk5Oe2M; 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 1uAcVx-0002OV-A8; Thu, 01 May 2025 18:36:21 -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 1uAcVo-0002Mz-Ov for qemu-devel@nongnu.org; Thu, 01 May 2025 18:36:12 -0400 Received: from mail-io1-xd2b.google.com ([2607:f8b0:4864:20::d2b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAcVn-0002zQ-92 for qemu-devel@nongnu.org; Thu, 01 May 2025 18:36:12 -0400 Received: by mail-io1-xd2b.google.com with SMTP id ca18e2360f4ac-8640d43f5e0so122303739f.0 for ; Thu, 01 May 2025 15:36:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746138970; x=1746743770; 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=kmhBmYebiRFz0OgzLtlxL2sc6it26EKxebtheKN6ZCc=; b=pwk5Oe2MnWz4SFYJ52v4CEE+LJievwsMW7SJ7vWx4ASvyyt5CUEPMrlYJ8CBIiWOWf 1ZWAk+DLUcLq3ZvG6DuUNNnOPzX/PWiYR+eVdAGFR8K0j/7yURHLLNfTMHxttuMVTC3B Ciws2muea5cexcAsBKy/reLsvrRdMUcdP6mQfL8iZdvogdkV9e2NRZAkfkX6pzogMiv7 n1y7UE/CLi+2TJ2Ydol8QD3JJnyPO7nNsLPW7wKyPi5MiMpaLqISJsCYpOBYoKX2EamR NZtonTVEVput2TRw3+b8Tc3P317vgdkAGy3PeE5ms/jESPNxw0A/B+uU+uUig09IJyfN N0HA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746138970; x=1746743770; 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=kmhBmYebiRFz0OgzLtlxL2sc6it26EKxebtheKN6ZCc=; b=HxtBEG+LFqRKkadYTvQLaRi82/yKtdTzBv0qaOwmNXnTqSKpwgMysftpAMbYtdchhy kvTg8Yhj45cUCLTtBo+uAMG1e2IYvf6Ltwa5QZSpL7j58LC+TDup1TQMxH1nJViFzfyi CAhci59XyDzBvkEX/Jw+S44Wx4eFCcTYf9QZ8EGZpo38Qlm2sg0ZfmVB5HNNzc2Se7ir dtEGu0sU0U/l+jReI2EFnSewl4ed1wXtMtuBnzua8MZwY9eY/j5iMMH0cs9/gNmt+7r2 8B1xyTilJ4l25My5YyVzSnZKJ5xsZ4awPtAzG1MjxZwOIWjPqlSnYQvtj/xuZWHrJr7l lu3g== X-Gm-Message-State: AOJu0YwtjhhjLNor3bhZ9Hq2Oc37dMF6sGKPDrYkaXI1TY6iFbMh7JaO qkIg8urIsByCCmPYj5OG3BGrlH2BSURyuaAtX59ekXkpP1NRzUsPEHrnCilNlwfQpxNa9m9LAgs p X-Gm-Gg: ASbGnct2f1X4NhiKH3Qf+y8hmLyd/T7dPzwKCGJBmoDOGxXJBLtz5o0mGk1FshdrNj5 bKG5So3x1upMtdkaYZiNsPRp5z+JQURw6tVt6djyukr1v53dm0oMFWpqFJd0msuDds/2KpmDKqL QnT60oaisST3FTlvc/+37NhysGj/SOXixlDw917hrTtNwAjacsi0i0AnuU87ainA56b5wEDTsNV f4Jko8N8aJVSGpgbLam7CpCIHvuOhslYBkSFBt+AxD09TiNhw83TmINOmsTzqP2nRJmjS4H0oNM W20ACxrGhPjwjtoiBUJqaZKy4tTwWHvk5te+O5zMR+csAzRUL6jzBSQZIbRAmONI/gB4ZVjZn3L jwTVd0VG+3aKJrSsl9pe8 X-Received: by 2002:a05:6e02:318c:b0:3d9:64cd:9490 with SMTP id e9e14a558f8ab-3d97c237f65mr9137645ab.16.1746138969972; Thu, 01 May 2025 15:36:09 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4f88aa8e162sm76335173.120.2025.05.01.15.36.08 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 15:36:09 -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 6/8] hw/i386/pc: Remove pc_compat_2_11[] array Date: Fri, 2 May 2025 00:35:20 +0200 Message-ID: <20250501223522.99772-7-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::d2b; envelope-from=philmd@linaro.org; helo=mail-io1-xd2b.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 The pc_compat_2_11[] array was only used by the pc-q35-2.11 and pc-i440fx-2.11 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daudé --- include/hw/i386/pc.h | 3 --- hw/i386/pc.c | 6 ------ 2 files changed, 9 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index c27ff262033..a81b9c4664c 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -277,9 +277,6 @@ extern const size_t pc_compat_3_0_len; extern GlobalProperty pc_compat_2_12[]; extern const size_t pc_compat_2_12_len; -extern GlobalProperty pc_compat_2_11[]; -extern const size_t pc_compat_2_11_len; - #define DEFINE_PC_MACHINE(suffix, namestr, initfn, optsfn) \ static void pc_machine_##suffix##_class_init(ObjectClass *oc, \ const void *data) \ diff --git a/hw/i386/pc.c b/hw/i386/pc.c index d3e38cf9f92..2119029f4be 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -214,12 +214,6 @@ GlobalProperty pc_compat_2_12[] = { }; const size_t pc_compat_2_12_len = G_N_ELEMENTS(pc_compat_2_12); -GlobalProperty pc_compat_2_11[] = { - { TYPE_X86_CPU, "x-migrate-smi-count", "off" }, - { "Skylake-Server" "-" TYPE_X86_CPU, "clflushopt", "off" }, -}; -const size_t pc_compat_2_11_len = G_N_ELEMENTS(pc_compat_2_11); - /* * @PC_FW_DATA: * Size of the chunk of memory at the top of RAM for the BIOS ACPI tables 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); From patchwork Thu May 1 22:35:22 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: 886453 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp541597wrq; Thu, 1 May 2025 15:37:09 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUvRH5lG/7KjVJX9Gae2rQxZgTtaYDIkKgAs+2l/C/LOdaQiishhU6sc1cfUUJT6Dw6J0nQng==@linaro.org X-Google-Smtp-Source: AGHT+IFyMYmGBkp0KV/Rj3qzGZhXzuv8q1o/e9iMGVbmHKMTCcyIJ0zEzwtvTgox1qBujrp/eeAm X-Received: by 2002:a05:622a:4a88:b0:476:b858:1f2d with SMTP id d75a77b69052e-48c32ac9060mr10880381cf.42.1746139029075; Thu, 01 May 2025 15:37:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746139029; cv=none; d=google.com; s=arc-20240605; b=FygOFdNSR7GGP09wfDKcA1RErHAkX4bsDfSZP08QbSbJfRkJA+5I+SZpM6y4q+F/6M LYf/TauzkdRjD8aTJRyXQx+aNIFuDLCZN1bcisLVdniZTMJvZmUE4dcfnYfOTBKrQ0E5 g4H6cmWSzr0Is0uNuayqa5rKzhw1vsEVqC/s/Th/NYRsWIvCo/YXrYe40/otI85m6uEo nuARj4ubrR8jeLpPPKYqZYCEn5JE5G8Z1JOI3mf1l/+8inQi560Ga7xhlMvTMSWhLGf7 sHmB0fOSla3HFPW3rxaiCb3hZwcqdnB1DF6QiOaYKFywwkmf5OA+5JVdg7tiX4Mi5M9V 3vxw== 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=CXNP4ncbywDgQ2lAyd8xlEZZDFNT5QDGjJog6RUNMzY=; fh=bJjaKaMQ3HkEGNz85aJeNaUi4jU+Dhz74OfPoi7UmSk=; b=RQiw6oL4etFfVPaBF20vs81Q3JtXkchSM+7loTiyGyosSypMS1VON78ZuT45+iuMkp +A5hbMZBcvMPDvy345nFDdt+Vu0dSXPziNZ7nxkjpu0f7TpMPDo/ggueUbYRnI2hpxdM cxKYsOGOyiZ+KQjcWOz+IB6uBupaUAjupxJ+fecR2ls8UWY1qtuLP4oWb35ZBL+3HzUe hPZdqbCUCijMIlvDR//dpJ3XYuy7KldRo6LAa/95ZxkmVnWCTXjIkEtP8UzBELZEt1e7 l20djmCWVYR2h/1cBJFPBZpizUMgSiuLCg3okiBZLPWA+ikK2ERgeQOv7DZisK5iEK7r Pzig==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nLV78wkC; 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-48b987244d5si15833031cf.388.2025.05.01.15.37.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 May 2025 15:37:09 -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=nLV78wkC; 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 1uAcWO-0003SD-5R; Thu, 01 May 2025 18:36:48 -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 1uAcW3-0002fF-On for qemu-devel@nongnu.org; Thu, 01 May 2025 18:36:28 -0400 Received: from mail-il1-x132.google.com ([2607:f8b0:4864:20::132]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAcW1-00031m-Se for qemu-devel@nongnu.org; Thu, 01 May 2025 18:36:27 -0400 Received: by mail-il1-x132.google.com with SMTP id e9e14a558f8ab-3d96836c1bcso5345985ab.3 for ; Thu, 01 May 2025 15:36:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746138984; x=1746743784; 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=CXNP4ncbywDgQ2lAyd8xlEZZDFNT5QDGjJog6RUNMzY=; b=nLV78wkCPGmpxz0GWNDgqZ98HsZrW0rs5PHPUFoxVrvvG4wgGLBzuV7TmO+0k+Kq7o sdiKQET0pXvcDxFdKlFhZyZ3yXdX4/lxCmCbPCyc8TdSGfT626dTXzXmMtKLCHAo927E ie00N0dtpesxO5HjlppUjEjNciePb/j1yN4/BaygL1bbE4Bs8d43rVJMOD9diO7Px3gi W9cOncuZSGRdPrUQVOCMy/ZuWF6GGPUtmHPYmq1AmET8xCRw/uWR+ZWn5ZMl6P5ehsl3 Ia+GATc0VkuB7bR+7V45Knx1eewhudks2DZikPsL6P8BUyzTc1i/FiUllBPjM4fwHPRV 8kdQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746138984; x=1746743784; 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=CXNP4ncbywDgQ2lAyd8xlEZZDFNT5QDGjJog6RUNMzY=; b=v/XxnnmhFFJptnyZCOKiS8gRy7MEC43fSvDbsUdXiLkCkiHaV7OYA/aZolPNa63jy7 V4xPRg49EL0PILiQtqarFme4oTUWqIgPAo5dtOrXXf4eWNpN1iRHNOknexlfj7HvDo+b Sz+MzKLKLoXfzaVJMkfhXnh0IeuFUvpaUvnn/9ispt8uzQt0OaC/pjOuLa8/dDoVuVsu orTui38OvHE/OiuGHB+sl/DfC7PMLFWxkt5tnyOBrXDJM9WORKersdbqV1kM11MLoZ8M rJ9naFz/B9bf/8wh4R+JqYy75LKnswLechVf8hMOlT27r6Nh4NTObdsrmPKXGj0o9s4F hOIg== X-Gm-Message-State: AOJu0Yxhbfu3+DO0KWHzJnRONyUrYufupb7cLWxEmU7xxZ8ppezIId4k b6pgjMkTsTflCkSAsEqoxrviSjpSYIaNyXiPlvhGoy9siYgylEuUkDpJR2J/BqMzVupYLEPj9iO d X-Gm-Gg: ASbGncuWr6rH6xWecJJTJ/ryEsNXIR9JQVb0BbSS9R/FOkIeC/gl7t3JGNA1omvI/n7 VUdd3xzCjvYlCp1A2my0fZ2QDGcZM6lnHFHmURkxp/voKdThyHEHHhHoC6JFSEdmaNDTnr/9i2J GIsbHuGbeQksalSzE7rqUyUhJ7l4bNkotI0jZOyqiTD6cNfwcs+acobU9dHZuz+32F+tIr9c2Wi KPn+UCO4oyFgrB7Ld6KlXpohQlCwxhO8bfzHU1XeIboh4Y8tIWFiauVziV2rfdvhO9l0F6tqQMF 66UyCNjKPAd/8AeCH8BKot9PhRkEDLVly7OBb0cRIBNVM7ED+QydXLdfr1eVlzHhFSK3JOle8Cn CtFLobXcHcxnn43Cxjjmx X-Received: by 2002:a05:6e02:b46:b0:3d8:1d7c:e180 with SMTP id e9e14a558f8ab-3d97c186f80mr7786115ab.6.1746138984208; Thu, 01 May 2025 15:36:24 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4f88aa93f35sm77772173.126.2025.05.01.15.36.22 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 15:36:23 -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 8/8] hw/i386/pc: Remove pc_compat_2_12[] array Date: Fri, 2 May 2025 00:35:22 +0200 Message-ID: <20250501223522.99772-9-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::132; envelope-from=philmd@linaro.org; helo=mail-il1-x132.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 The pc_compat_2_12[] array was only used by the pc-q35-2.12 and pc-i440fx-2.12 machines, which got removed. Remove it. Signed-off-by: Philippe Mathieu-Daudé --- include/hw/i386/pc.h | 3 --- hw/i386/pc.c | 8 -------- 2 files changed, 11 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index a81b9c4664c..22a29576f04 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -274,9 +274,6 @@ extern const size_t pc_compat_3_1_len; extern GlobalProperty pc_compat_3_0[]; extern const size_t pc_compat_3_0_len; -extern GlobalProperty pc_compat_2_12[]; -extern const size_t pc_compat_2_12_len; - #define DEFINE_PC_MACHINE(suffix, namestr, initfn, optsfn) \ static void pc_machine_##suffix##_class_init(ObjectClass *oc, \ const void *data) \ diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 2119029f4be..18a62b26b5d 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -206,14 +206,6 @@ GlobalProperty pc_compat_3_0[] = { }; const size_t pc_compat_3_0_len = G_N_ELEMENTS(pc_compat_3_0); -GlobalProperty pc_compat_2_12[] = { - { TYPE_X86_CPU, "legacy-cache", "on" }, - { TYPE_X86_CPU, "topoext", "off" }, - { "EPYC-" TYPE_X86_CPU, "xlevel", "0x8000000a" }, - { "EPYC-IBPB-" TYPE_X86_CPU, "xlevel", "0x8000000a" }, -}; -const size_t pc_compat_2_12_len = G_N_ELEMENTS(pc_compat_2_12); - /* * @PC_FW_DATA: * Size of the chunk of memory at the top of RAM for the BIOS ACPI tables