[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen master] x86/hvm: provide hvm_hap_supported
commit 3212e3464f336e0fd1270a88f65028833180709e Author: Wei Liu <wei.liu2@xxxxxxxxxx> AuthorDate: Sun Aug 26 13:19:37 2018 +0100 Commit: Wei Liu <wei.liu2@xxxxxxxxxx> CommitDate: Tue Aug 28 10:48:45 2018 +0100 x86/hvm: provide hvm_hap_supported And replace direct accesses in non-HVM subsystems to hvm_funcs.hap_supported with the new function, to avoid accessing an internal data structure of another subsystem directly. Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx> Acked-by: Jan Beulich <jbeulich@xxxxxxxx> --- xen/arch/x86/cpuid.c | 2 +- xen/arch/x86/domain.c | 2 +- xen/arch/x86/setup.c | 2 +- xen/include/asm-x86/hvm/hvm.h | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/cpuid.c b/xen/arch/x86/cpuid.c index 3d504b3328..88694ede8e 100644 --- a/xen/arch/x86/cpuid.c +++ b/xen/arch/x86/cpuid.c @@ -475,7 +475,7 @@ static void __init calculate_hvm_max_policy(void) *p = host_cpuid_policy; cpuid_policy_to_featureset(p, hvm_featureset); - hvm_featuremask = hvm_funcs.hap_supported ? + hvm_featuremask = hvm_hap_supported() ? hvm_hap_featuremask : hvm_shadow_featuremask; for ( i = 0; i < ARRAY_SIZE(hvm_featureset); ++i ) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 5bb900edec..eb1e93fc59 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -506,7 +506,7 @@ int arch_domain_create(struct domain *d, /* Need to determine if HAP is enabled before initialising paging */ if ( is_hvm_domain(d) ) d->arch.hvm_domain.hap_enabled = - hvm_funcs.hap_supported && (config->flags & XEN_DOMCTL_CDF_hap); + hvm_hap_supported() && (config->flags & XEN_DOMCTL_CDF_hap); if ( (rc = paging_domain_init(d, config->flags)) != 0 ) goto fail; diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index a22256f0cd..261861e1ed 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1690,7 +1690,7 @@ void __init noreturn __start_xen(unsigned long mbi_p) if ( dom0_pvh ) { dom0_cfg.flags |= (XEN_DOMCTL_CDF_hvm_guest | - ((hvm_funcs.hap_supported && !opt_dom0_shadow) ? + ((hvm_hap_supported() && !opt_dom0_shadow) ? XEN_DOMCTL_CDF_hap : 0)); dom0_cfg.arch.emulation_flags |= diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index 146720c356..5ea507b22b 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -621,6 +621,11 @@ static inline bool_t hvm_is_singlestep_supported(void) hvm_funcs.is_singlestep_supported()); } +static inline bool hvm_hap_supported(void) +{ + return hvm_funcs.hap_supported; +} + /* returns true if hardware supports alternate p2m's */ static inline bool hvm_altp2m_supported(void) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@xxxxxxxxxxxxxxxxxxxx https://lists.xenproject.org/xen-changelog
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |