81 lines
3.0 KiB
Diff
81 lines
3.0 KiB
Diff
|
From da24d2c5e2d61043340b601a09f22e41a1d52e5e Mon Sep 17 00:00:00 2001
|
||
|
|
From: Igor Mammedov <imammedo@redhat.com>
|
||
|
|
Date: Fri, 28 Aug 2020 16:23:47 -0400
|
||
|
|
Subject: [PATCH 05/11] Revert "hw/i386: Introduce apicid functions inside
|
||
|
|
X86MachineState"
|
||
|
|
|
||
|
|
RH-Author: Igor Mammedov <imammedo@redhat.com>
|
||
|
|
Message-id: <20200828162349.1616028-6-imammedo@redhat.com>
|
||
|
|
Patchwork-id: 98246
|
||
|
|
O-Subject: [RHEL-AV 8.3.0 qemu-kvm PATCH 5/7] Revert "hw/i386: Introduce apicid functions inside X86MachineState"
|
||
|
|
Bugzilla: 1873417
|
||
|
|
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
||
|
|
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
|
||
|
|
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
||
|
|
|
||
|
|
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1873417
|
||
|
|
Brew: http://brewweb.devel.redhat.com/brew/taskinfo?taskID=31005031
|
||
|
|
Branch: rhel-av-8.3.0
|
||
|
|
Upstream: RHEL only
|
||
|
|
Tested: locally
|
||
|
|
|
||
|
|
A regression was introduced since qemu-5.0, when EPYC specific
|
||
|
|
APIC ID encoding was introduced. Which leads to migration failing
|
||
|
|
with:
|
||
|
|
"
|
||
|
|
: Unknown savevm section or instance 'apic' 4. Make sure that your current VM setup matches your saved VM setup, including any hotplugged devices
|
||
|
|
: load of migration failed: Invalid argument
|
||
|
|
"
|
||
|
|
when EPYC cpu model and more than 1 numa node is used.
|
||
|
|
EPYC specific APIC ID encoding is considered as failed
|
||
|
|
experiment and upstream is preparing to revert it as well.
|
||
|
|
|
||
|
|
This reverts commit 6121c7fbfd98dbc3af1b00b56ff2eef66df87828.
|
||
|
|
|
||
|
|
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
|
||
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||
|
|
---
|
||
|
|
hw/i386/x86.c | 5 -----
|
||
|
|
include/hw/i386/x86.h | 9 ---------
|
||
|
|
2 files changed, 14 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/hw/i386/x86.c b/hw/i386/x86.c
|
||
|
|
index 41bdf146bd..4d8cb66258 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)
|
||
|
|
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.
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|