From: Wei Liu Date: Fri, 17 Aug 2018 10:23:28 +0000 (+0100) Subject: x86/mm: put paging_update_nestedmode under CONFIG_HVM X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~3268 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d7c60727a3f26b7fda49c8de188dd1cec021d23a;p=xen.git x86/mm: put paging_update_nestedmode under CONFIG_HVM Nested HVM is not enabled when !CONFIG_HVM. Signed-off-by: Wei Liu Acked-by: George Dunlap --- diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index dcee496eb0..7f460bd321 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -919,6 +919,7 @@ const struct paging_mode *paging_get_mode(struct vcpu *v) return paging_get_nestedmode(v); } +#ifdef CONFIG_HVM void paging_update_nestedmode(struct vcpu *v) { ASSERT(nestedhvm_enabled(v->domain)); @@ -930,6 +931,7 @@ void paging_update_nestedmode(struct vcpu *v) v->arch.paging.nestedmode = NULL; hvm_asid_flush_vcpu(v); } +#endif void paging_write_p2m_entry(struct p2m_domain *p2m, unsigned long gfn, l1_pgentry_t *p, l1_pgentry_t new,