diff options
Diffstat (limited to 'xen')
| -rw-r--r-- | xen/arch/x86/hvm/hvm.c | 28 | ||||
| -rw-r--r-- | xen/arch/x86/hvm/viridian.c | 4 |
2 files changed, 14 insertions, 18 deletions
diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index de81e4523d..6fcd95a246 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2499,27 +2499,25 @@ static enum hvm_copy_result __hvm_copy( page = get_page_from_gfn(curr->domain, gfn, &p2mt, P2M_UNSHARE); + if ( !page ) + return HVMCOPY_bad_gfn_to_mfn; + if ( p2m_is_paging(p2mt) ) { - if ( page ) - put_page(page); + put_page(page); p2m_mem_paging_populate(curr->domain, gfn); return HVMCOPY_gfn_paged_out; } if ( p2m_is_shared(p2mt) ) { - if ( page ) - put_page(page); + put_page(page); return HVMCOPY_gfn_shared; } if ( p2m_is_grant(p2mt) ) { - if ( page ) - put_page(page); + put_page(page); return HVMCOPY_unhandleable; } - if ( !page ) - return HVMCOPY_bad_gfn_to_mfn; p = (char *)__map_domain_page(page) + (addr & ~PAGE_MASK); @@ -2597,27 +2595,25 @@ static enum hvm_copy_result __hvm_clear(paddr_t addr, int size) page = get_page_from_gfn(curr->domain, gfn, &p2mt, P2M_UNSHARE); + if ( !page ) + return HVMCOPY_bad_gfn_to_mfn; + if ( p2m_is_paging(p2mt) ) { - if ( page ) - put_page(page); + put_page(page); p2m_mem_paging_populate(curr->domain, gfn); return HVMCOPY_gfn_paged_out; } if ( p2m_is_shared(p2mt) ) { - if ( page ) - put_page(page); + put_page(page); return HVMCOPY_gfn_shared; } if ( p2m_is_grant(p2mt) ) { - if ( page ) - put_page(page); + put_page(page); return HVMCOPY_unhandleable; } - if ( !page ) - return HVMCOPY_bad_gfn_to_mfn; p = (char *)__map_domain_page(page) + (addr & ~PAGE_MASK); diff --git a/xen/arch/x86/hvm/viridian.c b/xen/arch/x86/hvm/viridian.c index d5462f2aae..a6721c3eb0 100644 --- a/xen/arch/x86/hvm/viridian.c +++ b/xen/arch/x86/hvm/viridian.c @@ -157,7 +157,7 @@ static void enable_hypercall_page(struct domain *d) if ( page ) put_page(page); gdprintk(XENLOG_WARNING, "Bad GMFN %lx (MFN %lx)\n", gmfn, - page_to_mfn(page)); + page ? page_to_mfn(page) : INVALID_MFN); return; } @@ -202,7 +202,7 @@ static void initialize_apic_assist(struct vcpu *v) if ( page ) put_page(page); gdprintk(XENLOG_WARNING, "Bad GMFN %lx (MFN %lx)\n", gmfn, - page_to_mfn(page)); + page ? page_to_mfn(page) : INVALID_MFN); return; } |