From 56d8d0119d270f846c6c4943712b8a21fbe5d4d0 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Tue, 12 Feb 2019 11:54:57 +0100 Subject: [PATCH] VMX: don't ignore P2M setup error set_mmio_p2m_entry() may fail, in particular with -ENOMEM. Don't ignore such an error, but instead cause domain creation to fail in such a case. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Acked-by: Kevin Tian Release-acked-by: Juergen Gross --- xen/arch/x86/hvm/vmx/vmx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 64af8bf943..24def93d5d 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2999,10 +2999,10 @@ static int vmx_alloc_vlapic_mapping(struct domain *d) clear_domain_page(mfn); share_xen_page_with_guest(pg, d, SHARE_rw); d->arch.hvm.vmx.apic_access_mfn = mfn_x(mfn); - set_mmio_p2m_entry(d, paddr_to_pfn(APIC_DEFAULT_PHYS_BASE), mfn, - PAGE_ORDER_4K, p2m_get_hostp2m(d)->default_access); - return 0; + return set_mmio_p2m_entry(d, paddr_to_pfn(APIC_DEFAULT_PHYS_BASE), mfn, + PAGE_ORDER_4K, + p2m_get_hostp2m(d)->default_access); } static void vmx_free_vlapic_mapping(struct domain *d) -- 2.30.2