[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 14/20] Revert "hw/i386: Introduce apicid functions inside X86Machi
From: |
Eduardo Habkost |
Subject: |
[PULL 14/20] Revert "hw/i386: Introduce apicid functions inside X86MachineState" |
Date: |
Wed, 2 Sep 2020 07:53:17 -0400 |
From: Babu Moger <babu.moger@amd.com>
This reverts commit 6121c7fbfd98dbc3af1b00b56ff2eef66df87828.
Remove the EPYC specific apicid decoding and use the generic
default decoding.
Signed-off-by: Babu Moger <babu.moger@amd.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Message-Id: <159889935648.21294.8095493980805969544.stgit@naples-babu.amd.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
include/hw/i386/x86.h | 9 ---------
hw/i386/x86.c | 5 -----
2 files changed, 14 deletions(-)
diff --git a/include/hw/i386/x86.h b/include/hw/i386/x86.h
index b79f24e285..4d9a26326d 100644
--- a/include/hw/i386/x86.h
+++ b/include/hw/i386/x86.h
@@ -63,15 +63,6 @@ typedef struct {
OnOffAuto smm;
OnOffAuto acpi;
- /* Apic id specific handlers */
- uint32_t (*apicid_from_cpu_idx)(X86CPUTopoInfo *topo_info,
- unsigned cpu_index);
- void (*topo_ids_from_apicid)(apic_id_t apicid, X86CPUTopoInfo *topo_info,
- X86CPUTopoIDs *topo_ids);
- apic_id_t (*apicid_from_topo_ids)(X86CPUTopoInfo *topo_info,
- const X86CPUTopoIDs *topo_ids);
- uint32_t (*apicid_pkg_offset)(X86CPUTopoInfo *topo_info);
-
/*
* Address space used by IOAPIC device. All IOAPIC interrupts
* will be translated to MSI messages in the address space.
diff --git a/hw/i386/x86.c b/hw/i386/x86.c
index 3cc2318212..727c4a0f1d 100644
--- a/hw/i386/x86.c
+++ b/hw/i386/x86.c
@@ -896,11 +896,6 @@ static void x86_machine_initfn(Object *obj)
x86ms->smm = ON_OFF_AUTO_AUTO;
x86ms->acpi = ON_OFF_AUTO_AUTO;
x86ms->smp_dies = 1;
-
- x86ms->apicid_from_cpu_idx = x86_apicid_from_cpu_idx;
- x86ms->topo_ids_from_apicid = x86_topo_ids_from_apicid;
- x86ms->apicid_from_topo_ids = x86_apicid_from_topo_ids;
- x86ms->apicid_pkg_offset = apicid_pkg_offset;
}
static void x86_machine_class_init(ObjectClass *oc, void *data)
--
2.26.2
- [PULL 03/20] x86-iommu: Rename QOM type macros, (continued)
- [PULL 03/20] x86-iommu: Rename QOM type macros, Eduardo Habkost, 2020/09/02
- [PULL 05/20] arm: Fix typo in AARCH64_CPU_GET_CLASS definition, Eduardo Habkost, 2020/09/02
- [PULL 04/20] rdma: Rename INTERFACE_RDMA_PROVIDER_CLASS macro, Eduardo Habkost, 2020/09/02
- [PULL 07/20] rx: Move typedef RXCPU to cpu-qom.h, Eduardo Habkost, 2020/09/02
- [PULL 06/20] rx: Rename QOM type check macros, Eduardo Habkost, 2020/09/02
- [PULL 08/20] hda-audio: Set instance_size at base class, Eduardo Habkost, 2020/09/02
- [PULL 09/20] tls-cipher-suites: Correct instance_size, Eduardo Habkost, 2020/09/02
- [PULL 11/20] Revert "target/i386: Enable new apic id encoding for EPYC based cpus models", Eduardo Habkost, 2020/09/02
- [PULL 12/20] Revert "hw/i386: Move arch_id decode inside x86_cpus_init", Eduardo Habkost, 2020/09/02
- [PULL 10/20] Revert "i386: Fix pkg_id offset for EPYC cpu models", Eduardo Habkost, 2020/09/02
- [PULL 14/20] Revert "hw/i386: Introduce apicid functions inside X86MachineState",
Eduardo Habkost <=
- [PULL 13/20] Revert "i386: Introduce use_epyc_apic_id_encoding in X86CPUDefinition", Eduardo Habkost, 2020/09/02
- [PULL 16/20] Revert "hw/386: Add EPYC mode topology decoding functions", Eduardo Habkost, 2020/09/02
- [PULL 17/20] Revert "hw/i386: Update structures to save the number of nodes per package", Eduardo Habkost, 2020/09/02
- [PULL 15/20] Revert "target/i386: Cleanup and use the EPYC mode topology functions", Eduardo Habkost, 2020/09/02
- [PULL 18/20] virtio: add Virtio*BusClass sizes, Eduardo Habkost, 2020/09/02
- [PULL 19/20] target/i386/cpu: Fix memleak in x86_cpu_class_check_missing_features, Eduardo Habkost, 2020/09/02
- [PULL 20/20] target/i386/sev: Plug memleak in sev_read_file_base64, Eduardo Habkost, 2020/09/02
- Re: [PULL 00/20] x86 and machine queue, 2020-09-02, Peter Maydell, 2020/09/02