>>> On 18.03.17 at 11:53, <yu.c.zh...@linux.intel.com> wrote: > --- a/xen/arch/x86/hvm/hvm.c > +++ b/xen/arch/x86/hvm/hvm.c > @@ -1870,18 +1870,14 @@ int hvm_hap_nested_page_fault(paddr_t gpa, unsigned > long gla, > (npfec.write_access && > (p2m_is_discard_write(p2mt) || (p2mt == p2m_ioreq_server))) ) > { > - __put_gfn(p2m, gfn); > - if ( ap2m_active ) > - __put_gfn(hostp2m, gfn); > - > rc = 0; > if ( unlikely(is_pvh_domain(currd)) ) > - goto out; > + goto out_put_gfn;
Did you forget to re-base onto staging before you've sent this? is_pvh_domain() was gone before your submission already. When re-basing, feel free to also drop the dead "rc = 0;" line. Jan _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel