[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 41/45] x86: cleanup unused compat_apic_id_mode
From: |
Michael S. Tsirkin |
Subject: |
[PULL 41/45] x86: cleanup unused compat_apic_id_mode |
Date: |
Fri, 4 Mar 2022 08:42:30 -0500 |
From: Igor Mammedov <imammedo@redhat.com>
commit
f862ddbb1a4 (hw/i386: Remove the deprecated pc-1.x machine types)
removed the last user of broken APIC ID compat knob,
but compat_apic_id_mode itself was forgotten.
Clean it up and simplify x86_cpu_apic_id_from_index()
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Message-Id: <20220228131634.3389805-1-imammedo@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
include/hw/i386/x86.h | 2 --
hw/i386/x86.c | 16 +---------------
2 files changed, 1 insertion(+), 17 deletions(-)
diff --git a/include/hw/i386/x86.h b/include/hw/i386/x86.h
index a145a30370..916cc325ee 100644
--- a/include/hw/i386/x86.h
+++ b/include/hw/i386/x86.h
@@ -35,8 +35,6 @@ struct X86MachineClass {
/* TSC rate migration: */
bool save_tsc_khz;
- /* Enables contiguous-apic-ID mode */
- bool compat_apic_id_mode;
/* use DMA capable linuxboot option rom */
bool fwcfg_dma_enabled;
};
diff --git a/hw/i386/x86.c b/hw/i386/x86.c
index b84840a1bb..4cf107baea 100644
--- a/hw/i386/x86.c
+++ b/hw/i386/x86.c
@@ -83,24 +83,11 @@ inline void init_topo_info(X86CPUTopoInfo *topo_info,
uint32_t x86_cpu_apic_id_from_index(X86MachineState *x86ms,
unsigned int cpu_index)
{
- X86MachineClass *x86mc = X86_MACHINE_GET_CLASS(x86ms);
X86CPUTopoInfo topo_info;
- uint32_t correct_id;
- static bool warned;
init_topo_info(&topo_info, x86ms);
- correct_id = x86_apicid_from_cpu_idx(&topo_info, cpu_index);
- if (x86mc->compat_apic_id_mode) {
- if (cpu_index != correct_id && !warned && !qtest_enabled()) {
- error_report("APIC IDs set in compatibility mode, "
- "CPU topology won't match the configuration");
- warned = true;
- }
- return cpu_index;
- } else {
- return correct_id;
- }
+ return x86_apicid_from_cpu_idx(&topo_info, cpu_index);
}
@@ -1330,7 +1317,6 @@ static void x86_machine_class_init(ObjectClass *oc, void
*data)
mc->cpu_index_to_instance_props = x86_cpu_index_to_props;
mc->get_default_cpu_node_id = x86_get_default_cpu_node_id;
mc->possible_cpu_arch_ids = x86_possible_cpu_arch_ids;
- x86mc->compat_apic_id_mode = false;
x86mc->save_tsc_khz = true;
x86mc->fwcfg_dma_enabled = true;
nc->nmi_monitor_handler = x86_nmi;
--
MST
- [PULL 31/45] pcie: Add 1.2 version token for the Power Management Capability, (continued)
- [PULL 31/45] pcie: Add 1.2 version token for the Power Management Capability, Michael S. Tsirkin, 2022/03/04
- [PULL 32/45] pci-bridge/xio3130_upstream: Fix error handling, Michael S. Tsirkin, 2022/03/04
- [PULL 33/45] pci-bridge/xio3130_downstream: Fix error handling, Michael S. Tsirkin, 2022/03/04
- [PULL 34/45] headers: Add pvpanic.h, Michael S. Tsirkin, 2022/03/04
- [PULL 35/45] hw/misc/pvpanic: Use standard headers instead, Michael S. Tsirkin, 2022/03/04
- [PULL 36/45] pci: show id info when pci BDF conflict, Michael S. Tsirkin, 2022/03/04
- [PULL 37/45] pci: expose TYPE_XIO3130_DOWNSTREAM name, Michael S. Tsirkin, 2022/03/04
- [PULL 38/45] acpi: pcihp: pcie: set power on cap on parent slot, Michael S. Tsirkin, 2022/03/04
- [PULL 39/45] pc: add option to disable PS/2 mouse/keyboard, Michael S. Tsirkin, 2022/03/04
- [PULL 40/45] vhost-vsock: detach the virqueue element in case of error, Michael S. Tsirkin, 2022/03/04
- [PULL 41/45] x86: cleanup unused compat_apic_id_mode,
Michael S. Tsirkin <=
- [PULL 42/45] event_notifier: add event_notifier_get_wfd(), Michael S. Tsirkin, 2022/03/04
- [PULL 43/45] vhost: use wfd on functions setting vring call fd, Michael S. Tsirkin, 2022/03/04
- [PULL 44/45] configure, meson: allow enabling vhost-user on all POSIX systems, Michael S. Tsirkin, 2022/03/04
- [PULL 45/45] docs: vhost-user: add subsection for non-Linux platforms, Michael S. Tsirkin, 2022/03/04
- Re: [PULL 00/45] virtio,pc,pci: features, cleanups, fixes, Peter Maydell, 2022/03/04
- Re: [PULL 00/45] virtio,pc,pci: features, cleanups, fixes, Michael S. Tsirkin, 2022/03/06
- Re: [PULL 00/45] virtio,pc,pci: features, cleanups, fixes, Eric Auger, 2022/03/07