cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
Pablo Greco e6a3ae
From d52cded7f0cab801cfd59c4c97f70f48f332c1bb Mon Sep 17 00:00:00 2001
Pablo Greco e6a3ae
From: Eduardo Habkost <ehabkost@redhat.com>
Pablo Greco e6a3ae
Date: Mon, 23 Dec 2019 21:17:05 +0000
Pablo Greco e6a3ae
Subject: [PATCH] i386: Remove cpu64-rhel6 CPU model
Pablo Greco e6a3ae
Pablo Greco e6a3ae
RH-Author: Eduardo Habkost <ehabkost@redhat.com>
Pablo Greco e6a3ae
Message-id: <20191223211705.34325-1-ehabkost@redhat.com>
Pablo Greco e6a3ae
Patchwork-id: 93214
Pablo Greco e6a3ae
O-Subject: [RHEL-8.2.0 qemu-kvm PATCH] i386: Remove cpu64-rhel6 CPU model
Pablo Greco e6a3ae
Bugzilla: 1741346
Pablo Greco e6a3ae
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Pablo Greco e6a3ae
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
Pablo Greco e6a3ae
RH-Acked-by: Thomas Huth <thuth@redhat.com>
Pablo Greco e6a3ae
Pablo Greco e6a3ae
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1741346
Pablo Greco e6a3ae
BRANCH: rhel-8.2.0
Pablo Greco e6a3ae
Upstream: not applicable
Pablo Greco e6a3ae
Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=25526009
Pablo Greco e6a3ae
Pablo Greco e6a3ae
We don't provide rhel6 machine types anymore, so we don't need to
Pablo Greco e6a3ae
provide compatibility with RHEl6.  cpu64-rhel6 was documented as
Pablo Greco e6a3ae
deprecated and scheduled for removal in 8.2, so now it's time to
Pablo Greco e6a3ae
remove it.
Pablo Greco e6a3ae
Pablo Greco e6a3ae
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Pablo Greco e6a3ae
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
Pablo Greco e6a3ae
---
Pablo Greco e6a3ae
 target/i386/cpu.c | 26 +-------------------------
Pablo Greco e6a3ae
 1 file changed, 1 insertion(+), 25 deletions(-)
Pablo Greco e6a3ae
Pablo Greco e6a3ae
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
Pablo Greco e6a3ae
index 0717c66..33abc24 100644
Pablo Greco e6a3ae
--- a/target/i386/cpu.c
Pablo Greco e6a3ae
+++ b/target/i386/cpu.c
Pablo Greco e6a3ae
@@ -1739,12 +1739,7 @@ static CPUCaches epyc_cache_info = {
Pablo Greco e6a3ae
 
Pablo Greco e6a3ae
 static X86CPUDefinition builtin_x86_defs[] = {
Pablo Greco e6a3ae
     {
Pablo Greco e6a3ae
-        /* qemu64 is the default CPU model for all *-rhel7.* machine-types.
Pablo Greco e6a3ae
-         * The default on RHEL-6 was cpu64-rhel6.
Pablo Greco e6a3ae
-         * libvirt assumes that qemu64 is the default for _all_ machine-types,
Pablo Greco e6a3ae
-         * so we should try to keep qemu64 and cpu64-rhel6 as similar as
Pablo Greco e6a3ae
-         * possible.
Pablo Greco e6a3ae
-         */
Pablo Greco e6a3ae
+        /* qemu64 is the default CPU model for all machine-types */
Pablo Greco e6a3ae
         .name = "qemu64",
Pablo Greco e6a3ae
         .level = 0xd,
Pablo Greco e6a3ae
         .vendor = CPUID_VENDOR_AMD,
Pablo Greco e6a3ae
@@ -2045,25 +2040,6 @@ static X86CPUDefinition builtin_x86_defs[] = {
Pablo Greco e6a3ae
         .model_id = "Intel(R) Atom(TM) CPU N270   @ 1.60GHz",
Pablo Greco e6a3ae
     },
Pablo Greco e6a3ae
     {
Pablo Greco e6a3ae
-        .name = "cpu64-rhel6",
Pablo Greco e6a3ae
-        .level = 4,
Pablo Greco e6a3ae
-        .vendor = CPUID_VENDOR_AMD,
Pablo Greco e6a3ae
-        .family = 6,
Pablo Greco e6a3ae
-        .model = 13,
Pablo Greco e6a3ae
-        .stepping = 3,
Pablo Greco e6a3ae
-        .features[FEAT_1_EDX] = CPUID_SSE2 | CPUID_SSE | CPUID_FXSR |
Pablo Greco e6a3ae
-             CPUID_MMX | CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV |
Pablo Greco e6a3ae
-             CPUID_MCA | CPUID_PGE | CPUID_MTRR | CPUID_SEP | CPUID_APIC |
Pablo Greco e6a3ae
-             CPUID_CX8 | CPUID_MCE | CPUID_PAE | CPUID_MSR | CPUID_TSC |
Pablo Greco e6a3ae
-             CPUID_PSE | CPUID_DE | CPUID_FP87,
Pablo Greco e6a3ae
-        .features[FEAT_1_ECX] = CPUID_EXT_CX16 | CPUID_EXT_SSE3,
Pablo Greco e6a3ae
-        .features[FEAT_8000_0001_EDX] = CPUID_EXT2_LM | CPUID_EXT2_NX | CPUID_EXT2_SYSCALL,
Pablo Greco e6a3ae
-        .features[FEAT_8000_0001_ECX] = CPUID_EXT3_SSE4A | CPUID_EXT3_ABM |
Pablo Greco e6a3ae
-             CPUID_EXT3_SVM | CPUID_EXT3_LAHF_LM,
Pablo Greco e6a3ae
-        .xlevel = 0x8000000A,
Pablo Greco e6a3ae
-        .model_id = "QEMU Virtual CPU version (cpu64-rhel6)",
Pablo Greco e6a3ae
-    },
Pablo Greco e6a3ae
-    {
Pablo Greco e6a3ae
         .name = "Conroe",
Pablo Greco e6a3ae
         .level = 10,
Pablo Greco e6a3ae
         .vendor = CPUID_VENDOR_INTEL,
Pablo Greco e6a3ae
-- 
Pablo Greco e6a3ae
1.8.3.1
Pablo Greco e6a3ae