64 lines
2.3 KiB
Diff
64 lines
2.3 KiB
Diff
|
From a36be18a97841a091256e9934fb323afc9c3a57a Mon Sep 17 00:00:00 2001
|
||
|
|
From: Igor Mammedov <imammedo@redhat.com>
|
||
|
|
Date: Fri, 28 Aug 2020 16:23:44 -0400
|
||
|
|
Subject: [PATCH 02/11] Revert "target/i386: Enable new apic id encoding for
|
||
|
|
EPYC based cpus models"
|
||
|
|
|
||
|
|
RH-Author: Igor Mammedov <imammedo@redhat.com>
|
||
|
|
Message-id: <20200828162349.1616028-3-imammedo@redhat.com>
|
||
|
|
Patchwork-id: 98245
|
||
|
|
O-Subject: [RHEL-AV 8.3.0 qemu-kvm PATCH 2/7] Revert "target/i386: Enable new apic id encoding for EPYC based cpus models"
|
||
|
|
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 247b18c593ec298446645af8d5d28911daf653b1.
|
||
|
|
|
||
|
|
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
|
||
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||
|
|
---
|
||
|
|
target/i386/cpu.c | 2 --
|
||
|
|
1 file changed, 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
|
||
|
|
index 6517cc73a2..66b6a77b2f 100644
|
||
|
|
--- a/target/i386/cpu.c
|
||
|
|
+++ b/target/i386/cpu.c
|
||
|
|
@@ -3996,7 +3996,6 @@ static X86CPUDefinition builtin_x86_defs[] = {
|
||
|
|
.xlevel = 0x8000001E,
|
||
|
|
.model_id = "AMD EPYC Processor",
|
||
|
|
.cache_info = &epyc_cache_info,
|
||
|
|
- .use_epyc_apic_id_encoding = 1,
|
||
|
|
.versions = (X86CPUVersionDefinition[]) {
|
||
|
|
{ .version = 1 },
|
||
|
|
{
|
||
|
|
@@ -4124,7 +4123,6 @@ static X86CPUDefinition builtin_x86_defs[] = {
|
||
|
|
.xlevel = 0x8000001E,
|
||
|
|
.model_id = "AMD EPYC-Rome Processor",
|
||
|
|
.cache_info = &epyc_rome_cache_info,
|
||
|
|
- .use_epyc_apic_id_encoding = 1,
|
||
|
|
},
|
||
|
|
};
|
||
|
|
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|