From nobody Mon Feb 2 09:27:37 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1767841840; cv=none; d=zohomail.com; s=zohoarc; b=b/elVHsSWOeONFWEuT5+EgNliz/9ba8kRgC+60pF31eHMUZAv/LJZPSR1RPcjUVa5YqBi1hdqyvYvkMaSGwHWiGlZTdVfdknisS88kno5Xb/CS0mBl/dUalP1bNfyuzpjaQyfKZkIEDZY3bAdEBB7wOIV6QHoofNSk4X7a/b+yc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767841840; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=UDA+ph7wZkhpEv7qXkRa/j6txu70Cj2RAJ5P6yYXxoo=; b=CuIUmlIc57Z9f53FnB9BgIyvoYnmpAIvo5F//2bq6rkgQfIlT23859oNgv5wFBZjEXszhjLoWd5tcbFuS62MXO92a+oq7WMTKk9RfH9GespPeDEHLwPZjJPAJydhU/AVgrxwgqBWJjEfndWDa6tHTGZ71xSIwf4vicx+bGVs4ss= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1767841840298425.66213025287084; Wed, 7 Jan 2026 19:10:40 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vdgNi-0004Tb-09; Wed, 07 Jan 2026 22:08:14 -0500 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 1vdgNe-00047J-Vv; Wed, 07 Jan 2026 22:08:11 -0500 Received: from mgamail.intel.com ([198.175.65.9]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vdgNd-0005Lk-3T; Wed, 07 Jan 2026 22:08:10 -0500 Received: from orviesa006.jf.intel.com ([10.64.159.146]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Jan 2026 19:08:07 -0800 Received: from liuzhao-optiplex-7080.sh.intel.com ([10.239.160.39]) by orviesa006.jf.intel.com with ESMTP; 07 Jan 2026 19:07:57 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1767841690; x=1799377690; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ckSnMyvgyGeZ6bDNlS111ojYxxq4qhk1knTSa06gqf0=; b=O6M1zEbs+b2ps5iqtj14RO03XrvmqzJtjkQ7JI03BnIfe5tZ8iwHj/IM TzbnbZhBBnYeO8OoX8LlMyBFchyumXJ/pGERE1nH2bUMo8QDiEMEz+uny UiM+ZFTaIrwJgWQeOExiNaxO9ZTm19rW3BLz1JwXx2Xd/pDiR4lJ4OeJt deCOcCGxv8ywhtsfNZTsW9b9NqsPPNC+4is9is7cNnwW6/W3qAAan9elJ o8aV436ErKiur/Kf+ZyhRyIwgKi1ZwgT30Fkoo5vt0dXau5F0FHvGKKmb qbeUo8Rse7faLK/YlfdEwzqXD8RfE2EQoXgK2jG1iECIUqpcIAQ4yvDrc A==; X-CSE-ConnectionGUID: Il/l8DjzT8KQxK4dWc7BLg== X-CSE-MsgGUID: j+PM9o4iSGmD57ha63e5NA== X-IronPort-AV: E=McAfee;i="6800,10657,11664"; a="91877365" X-IronPort-AV: E=Sophos;i="6.21,209,1763452800"; d="scan'208";a="91877365" X-CSE-ConnectionGUID: zRNw9JwVQaSJl0olFtIhew== X-CSE-MsgGUID: SbQo8FEXQlKfMzmxoAHulg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.21,209,1763452800"; d="scan'208";a="202211059" From: Zhao Liu To: Paolo Bonzini , "Michael S . Tsirkin" , Igor Mammedov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Marcel Apfelbaum , Thomas Huth Cc: qemu-devel@nongnu.org, devel@lists.libvirt.org, kvm@vger.kernel.org, qemu-riscv@nongnu.org, qemu-arm@nongnu.org, Richard Henderson , Sergio Lopez , Gerd Hoffmann , Peter Maydell , Laurent Vivier , Jiaxun Yang , Yi Liu , Eduardo Habkost , Alistair Francis , Daniel Henrique Barboza , Marcelo Tosatti , Weiwei Li , Amit Shah , Xiaoyao Li , Yanan Wang , Helge Deller , Palmer Dabbelt , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Ani Sinha , Fabiano Rosas , Liu Zhiwei , =?UTF-8?q?Cl=C3=A9ment=20Mathieu--Drif?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Huacai Chen , Jason Wang , Mark Cave-Ayland , BALATON Zoltan , Peter Krempa , Jiri Denemark , Zhao Liu Subject: [PATCH v6 16/27] hw/i386/pc: Remove pc_compat_2_6[] array Date: Thu, 8 Jan 2026 11:30:40 +0800 Message-Id: <20260108033051.777361-17-zhao1.liu@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260108033051.777361-1-zhao1.liu@intel.com> References: <20260108033051.777361-1-zhao1.liu@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=198.175.65.9; envelope-from=zhao1.liu@intel.com; helo=mgamail.intel.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1767841840531158500 From: Philippe Mathieu-Daud=C3=A9 The pc_compat_2_6[] array was only used by the pc-q35-2.6 and pc-i440fx-2.6 machines, which got removed. Remove it. Reviewed-by: Mark Cave-Ayland Reviewed-by: Thomas Huth Reviewed-by: Zhao Liu Reviewed-by: Igor Mammedov Signed-off-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Zhao Liu --- hw/i386/pc.c | 8 -------- include/hw/i386/pc.h | 3 --- 2 files changed, 11 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 4783216c5e09..4b5b7f24d7de 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -263,14 +263,6 @@ GlobalProperty pc_compat_2_7[] =3D { }; const size_t pc_compat_2_7_len =3D G_N_ELEMENTS(pc_compat_2_7); =20 -GlobalProperty pc_compat_2_6[] =3D { - { TYPE_X86_CPU, "cpuid-0xb", "off" }, - { "vmxnet3", "romfile", "" }, - { TYPE_X86_CPU, "fill-mtrr-mask", "off" }, - { "apic-common", "legacy-instance-id", "on", } -}; -const size_t pc_compat_2_6_len =3D G_N_ELEMENTS(pc_compat_2_6); - /* * @PC_FW_DATA: * Size of the chunk of memory at the top of RAM for the BIOS ACPI tables diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 3f94bc5652a9..0f7d656b3f3b 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -295,9 +295,6 @@ extern const size_t pc_compat_2_8_len; extern GlobalProperty pc_compat_2_7[]; extern const size_t pc_compat_2_7_len; =20 -extern GlobalProperty pc_compat_2_6[]; -extern const size_t pc_compat_2_6_len; - #define DEFINE_PC_MACHINE(suffix, namestr, initfn, optsfn) \ static void pc_machine_##suffix##_class_init(ObjectClass *oc, \ const void *data) \ --=20 2.34.1