diff options
| -rw-r--r-- | tools/libxc/xc_memshr.c | 14 | ||||
| -rw-r--r-- | tools/libxc/xenctrl.h | 3 | ||||
| -rw-r--r-- | xen/arch/x86/mm/mem_sharing.c | 11 |
3 files changed, 2 insertions, 26 deletions
diff --git a/tools/libxc/xc_memshr.c b/tools/libxc/xc_memshr.c index ae60571dee..d6a9539267 100644 --- a/tools/libxc/xc_memshr.c +++ b/tools/libxc/xc_memshr.c @@ -208,20 +208,6 @@ int xc_memshr_debug_gfn(xc_interface *xch, return xc_memshr_memop(xch, domid, &mso); } -int xc_memshr_debug_mfn(xc_interface *xch, - domid_t domid, - unsigned long mfn) -{ - xen_mem_sharing_op_t mso; - - memset(&mso, 0, sizeof(mso)); - - mso.op = XENMEM_sharing_op_debug_mfn; - mso.u.debug.u.mfn = mfn; - - return xc_memshr_memop(xch, domid, &mso); -} - int xc_memshr_debug_gref(xc_interface *xch, domid_t domid, grant_ref_t gref) diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h index 812e72331d..0163b73f48 100644 --- a/tools/libxc/xenctrl.h +++ b/tools/libxc/xenctrl.h @@ -1955,9 +1955,6 @@ int xc_memshr_domain_resume(xc_interface *xch, int xc_memshr_debug_gfn(xc_interface *xch, domid_t domid, unsigned long gfn); -int xc_memshr_debug_mfn(xc_interface *xch, - domid_t domid, - unsigned long mfn); int xc_memshr_debug_gref(xc_interface *xch, domid_t domid, grant_ref_t gref); diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index 42e8a976e8..d4488ec9f6 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -512,7 +512,7 @@ int mem_sharing_debug_mfn(mfn_t mfn) if ( (page = __grab_shared_page(mfn)) == NULL) { gdprintk(XENLOG_ERR, "Invalid MFN=%lx\n", mfn_x(mfn)); - return -1; + return -EINVAL; } MEM_SHARING_DEBUG( @@ -599,7 +599,7 @@ int mem_sharing_debug_gref(struct domain *d, grant_ref_t ref) MEM_SHARING_DEBUG( "Asked to debug [dom=%d,gref=%d], but not yet inited.\n", d->domain_id, ref); - return -1; + return -EINVAL; } (void)mem_sharing_gref_to_gfn(d, ref, &gfn); shah = shared_entry_header(d->grant_table, ref); @@ -1222,13 +1222,6 @@ int mem_sharing_memop(struct domain *d, xen_mem_sharing_op_t *mec) } break; - case XENMEM_sharing_op_debug_mfn: - { - unsigned long mfn = mec->u.debug.u.mfn; - rc = mem_sharing_debug_mfn(_mfn(mfn)); - } - break; - case XENMEM_sharing_op_debug_gref: { grant_ref_t gref = mec->u.debug.u.gref; |