From 9fdeb539ee5737b90b362ca0fbff9e48c6496991 Mon Sep 17 00:00:00 2001 From: Aravindh Puthiyaparambil Date: Tue, 15 Apr 2014 17:25:25 -0700 Subject: [PATCH] tools/libxc: Remove xc_hvm_[sg]et_mem_access() APIs Remove xc_hvm_[sg]et_mem_access() APIs which have been replaced by xc_[sg]_mem_access() APIs. Signed-off-by: Aravindh Puthiyaparambil Acked-by: Ian Campbell --- tools/libxc/xc_misc.c | 61 ------------------------------------------- tools/libxc/xenctrl.h | 14 ---------- 2 files changed, 75 deletions(-) diff --git a/tools/libxc/xc_misc.c b/tools/libxc/xc_misc.c index 3303454591..4143de60a3 100644 --- a/tools/libxc/xc_misc.c +++ b/tools/libxc/xc_misc.c @@ -593,67 +593,6 @@ int xc_hvm_set_mem_type( return rc; } -int xc_hvm_set_mem_access( - xc_interface *xch, domid_t dom, hvmmem_access_t mem_access, uint64_t first_pfn, uint64_t nr) -{ - DECLARE_HYPERCALL; - DECLARE_HYPERCALL_BUFFER(struct xen_hvm_set_mem_access, arg); - int rc; - - arg = xc_hypercall_buffer_alloc(xch, arg, sizeof(*arg)); - if ( arg == NULL ) - { - PERROR("Could not allocate memory for xc_hvm_set_mem_access hypercall"); - return -1; - } - - arg->domid = dom; - arg->hvmmem_access = mem_access; - arg->first_pfn = first_pfn; - arg->nr = nr; - - hypercall.op = __HYPERVISOR_hvm_op; - hypercall.arg[0] = HVMOP_set_mem_access; - hypercall.arg[1] = HYPERCALL_BUFFER_AS_ARG(arg); - - rc = do_xen_hypercall(xch, &hypercall); - - xc_hypercall_buffer_free(xch, arg); - - return rc; -} - -int xc_hvm_get_mem_access( - xc_interface *xch, domid_t dom, uint64_t pfn, hvmmem_access_t* mem_access) -{ - DECLARE_HYPERCALL; - DECLARE_HYPERCALL_BUFFER(struct xen_hvm_get_mem_access, arg); - int rc; - - arg = xc_hypercall_buffer_alloc(xch, arg, sizeof(*arg)); - if ( arg == NULL ) - { - PERROR("Could not allocate memory for xc_hvm_get_mem_access hypercall"); - return -1; - } - - arg->domid = dom; - arg->pfn = pfn; - - hypercall.op = __HYPERVISOR_hvm_op; - hypercall.arg[0] = HVMOP_get_mem_access; - hypercall.arg[1] = HYPERCALL_BUFFER_AS_ARG(arg); - - rc = do_xen_hypercall(xch, &hypercall); - - if ( !rc ) - *mem_access = arg->hvmmem_access; - - xc_hypercall_buffer_free(xch, arg); - - return rc; -} - int xc_hvm_inject_trap( xc_interface *xch, domid_t dom, int vcpu, uint32_t vector, uint32_t type, uint32_t error_code, uint32_t insn_len, diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h index 3513ddb627..02129f7661 100644 --- a/tools/libxc/xenctrl.h +++ b/tools/libxc/xenctrl.h @@ -1728,20 +1728,6 @@ int xc_hvm_modified_memory( int xc_hvm_set_mem_type( xc_interface *xch, domid_t dom, hvmmem_type_t memtype, uint64_t first_pfn, uint64_t nr); -/* - * Set a range of memory to a specific access. - * Allowed types are HVMMEM_access_default, HVMMEM_access_n, any combination of - * HVM_access_ + (rwx), and HVM_access_rx2rw - */ -int xc_hvm_set_mem_access( - xc_interface *xch, domid_t dom, hvmmem_access_t memaccess, uint64_t first_pfn, uint64_t nr); - -/* - * Gets the mem access for the given page (returned in memacess on success) - */ -int xc_hvm_get_mem_access( - xc_interface *xch, domid_t dom, uint64_t pfn, hvmmem_access_t* memaccess); - /* * Injects a hardware/software CPU trap, to take effect the next time the HVM * resumes. -- 2.39.5