Blame SOURCES/kvm-Remove-arch-capabilities-deprecation.patch

c461a1
From 8328a7b83a78666fff5166a615e4ef5792c743f0 Mon Sep 17 00:00:00 2001
c461a1
From: "plai@redhat.com" <plai@redhat.com>
c461a1
Date: Mon, 23 Sep 2019 20:40:27 +0200
c461a1
Subject: [PATCH 11/12] Remove arch-capabilities deprecation
c461a1
c461a1
RH-Author: plai@redhat.com
c461a1
Message-id: <1569271227-28026-11-git-send-email-plai@redhat.com>
c461a1
Patchwork-id: 90854
c461a1
O-Subject: [RHEL7.8 qemu-kvm PATCH v6 10/10] Remove arch-capabilities deprecation
c461a1
Bugzilla: 1709971
c461a1
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
2ec96d
RH-Acked-by: Bandan Das <bsd@redhat.com>
c461a1
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
2ec96d
2ec96d
[RHEL INTERNAL] Logic to support arch-capabilities now exists.
2ec96d
Deprecation of arch-facilities is no longer needed.
2ec96d
2ec96d
fixes: arch-facilities deprecation introduced by
2ec96d
  59c1aecdd i386: Deprecate arch-facilities and make it block live migration
2ec96d
2ec96d
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
c461a1
c461a1
Conflicts:
c461a1
	target-i386/cpu.c
2ec96d
---
2ec96d
 target-i386/cpu.c | 8 --------
2ec96d
 1 file changed, 8 deletions(-)
2ec96d
2ec96d
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
c461a1
index 24fc000..3ea4e97 100644
2ec96d
--- a/target-i386/cpu.c
2ec96d
+++ b/target-i386/cpu.c
2ec96d
@@ -34,7 +34,6 @@
2ec96d
 #include "qapi-visit.h"
2ec96d
 #include "qapi/visitor.h"
2ec96d
 #include "sysemu/arch_init.h"
2ec96d
-#include "migration/migration.h"
2ec96d
 
2ec96d
 #include "hw/hw.h"
2ec96d
 #if defined(CONFIG_KVM)
c461a1
@@ -1819,13 +1818,6 @@ static void kvm_cpu_fill_host(x86_def_t *x86_cpu_def)
2ec96d
         x86_cpu_def->features[w] = x86_cpu_get_supported_feature_word(w);
2ec96d
     }
2ec96d
 
2ec96d
-    /*
2ec96d
-     * Features that won't be enabled automatically by "-cpu host" even if
2ec96d
-     * reported by GET_SUPPORTED_CPUID:
2ec96d
-     */
2ec96d
-
2ec96d
-    /* arch-facilities: deprecated (see comment on x86_cpu_realizefn()) */
2ec96d
-    x86_cpu_def->features[FEAT_7_0_EDX] &= ~CPUID_7_0_EDX_ARCH_CAPABILITIES;
c461a1
     /* invtsc: not migratable, so not enabled by default */
c461a1
     x86_cpu_def->features[FEAT_8000_0007_EDX] &= ~CPUID_APM_INVTSC;
2ec96d
 
2ec96d
-- 
2ec96d
1.8.3.1
2ec96d