|
 |
2ec96d |
From deb80e0563048d3bb02d4c975929ddc8502172d4 Mon Sep 17 00:00:00 2001
|
|
|
2ec96d |
From: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
2ec96d |
Date: Wed, 9 Oct 2019 17:51:48 +0200
|
|
|
2ec96d |
Subject: [PATCH 10/10] Remove arch-capabilities deprecation
|
|
|
2ec96d |
|
|
|
2ec96d |
RH-Author: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
2ec96d |
Message-id: <20191009175148.1361-11-ehabkost@redhat.com>
|
|
|
2ec96d |
Patchwork-id: 91366
|
|
|
2ec96d |
O-Subject: [RHEL-7.7.z qemu-kvm PATCH 10/10] Remove arch-capabilities deprecation
|
|
|
2ec96d |
Bugzilla: 1730606
|
|
|
2ec96d |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
2ec96d |
RH-Acked-by: Bandan Das <bsd@redhat.com>
|
|
|
2ec96d |
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
|
|
|
2ec96d |
|
|
|
2ec96d |
From: Paul Lai <plai@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 |
7.7.z backport notes (ehabkost):
|
|
|
2ec96d |
* Cherry pick from 7.8 tree with no conflicts
|
|
|
2ec96d |
|
|
|
2ec96d |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
2ec96d |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
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
|
|
|
2ec96d |
index 35381f0..5aa45ba 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)
|
|
|
2ec96d |
@@ -1802,13 +1801,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;
|
|
|
2ec96d |
|
|
|
2ec96d |
#endif /* CONFIG_KVM */
|
|
|
2ec96d |
}
|
|
|
2ec96d |
--
|
|
|
2ec96d |
1.8.3.1
|
|
|
2ec96d |
|