mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
x86/PV: guard svm specific functions with using_svm() check
Replace cpu_has_svm check with using_svm(), so that not only SVM support in CPU is being checked at runtime, but also at build time we ensure the availability of functions svm_load_segs() and svm_load_segs_prefetch(). Since SVM depends on HVM, it can be used alone. Signed-off-by: Xenia Ragiadakou <burzalodowa@gmail.com> Signed-off-by: Sergiy Kibrik <Sergiy_Kibrik@epam.com> Acked-by: Jan Beulich <jbeulich@suse.com>
This commit is contained in:
1 parent
6b70f0ba99
commit
23bb8addf2
1 file changed
+3
-5
@@ -1720,11 +1720,9 @@ static void load_segments(struct vcpu *n)
|
||||
if ( !(n->arch.flags & TF_kernel_mode) )
|
||||
SWAP(gsb, gss);
|
||||
|
||||
#ifdef CONFIG_HVM
|
||||
if ( cpu_has_svm && (uregs->fs | uregs->gs) <= 3 )
|
||||
if ( using_svm() && (uregs->fs | uregs->gs) <= 3 )
|
||||
fs_gs_done = svm_load_segs(n->arch.pv.ldt_ents, LDT_VIRT_START(n),
|
||||
n->arch.pv.fs_base, gsb, gss);
|
||||
#endif
|
||||
}
|
||||
|
||||
if ( !fs_gs_done )
|
||||
@@ -2037,9 +2035,9 @@ static void __context_switch(void)
|
||||
|
||||
write_ptbase(n);
|
||||
|
||||
#if defined(CONFIG_PV) && defined(CONFIG_HVM)
|
||||
#ifdef CONFIG_PV
|
||||
/* Prefetch the VMCB if we expect to use it later in the context switch */
|
||||
if ( cpu_has_svm && is_pv_64bit_domain(nd) && !is_idle_domain(nd) )
|
||||
if ( using_svm() && is_pv_64bit_domain(nd) && !is_idle_domain(nd) )
|
||||
svm_load_segs_prefetch();
|
||||
#endif
|
||||
|
||||
|
||||