From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tamas K Lengyel Subject: [PATCH v3 03/15] xen: Relocate mem_event_op domctl and access_op memop into common. Date: Mon, 1 Sep 2014 16:21:57 +0200 Message-ID: <1409581329-2607-4-git-send-email-tklengyel@sec.in.tum.de> References: <1409581329-2607-1-git-send-email-tklengyel@sec.in.tum.de> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1409581329-2607-1-git-send-email-tklengyel@sec.in.tum.de> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: ian.campbell@citrix.com, tim@xen.org, julien.grall@linaro.org, ian.jackson@eu.citrix.com, stefano.stabellini@citrix.com, andres@lagarcavilla.org, jbeulich@suse.com, dgdegra@tycho.nsa.gov, Tamas K Lengyel List-Id: xen-devel@lists.xenproject.org Signed-off-by: Tamas K Lengyel --- xen/arch/x86/domctl.c | 8 -------- xen/arch/x86/x86_64/compat/mm.c | 4 ---- xen/arch/x86/x86_64/mm.c | 4 ---- xen/common/domctl.c | 9 +++++++++ xen/common/memory.c | 5 +++++ 5 files changed, 14 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 3aeb79d..55a9495 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1207,14 +1207,6 @@ long arch_do_domctl( } break; - case XEN_DOMCTL_mem_event_op: - { - ret = mem_event_domctl(d, &domctl->u.mem_event_op, - guest_handle_cast(u_domctl, void)); - copyback = 1; - } - break; - case XEN_DOMCTL_mem_sharing_op: { ret = mem_sharing_domctl(d, &domctl->u.mem_sharing_op); diff --git a/xen/arch/x86/x86_64/compat/mm.c b/xen/arch/x86/x86_64/compat/mm.c index 203c6b4..9c1a36d 100644 --- a/xen/arch/x86/x86_64/compat/mm.c +++ b/xen/arch/x86/x86_64/compat/mm.c @@ -198,10 +198,6 @@ int compat_arch_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) break; } - case XENMEM_access_op: - rc = mem_access_memop(cmd, guest_handle_cast(arg, xen_mem_access_op_t)); - break; - case XENMEM_sharing_op: { xen_mem_sharing_op_t mso; diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index 1f9702d..c8272e9 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -1048,10 +1048,6 @@ long subarch_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) break; } - case XENMEM_access_op: - rc = mem_access_memop(cmd, guest_handle_cast(arg, xen_mem_access_op_t)); - break; - case XENMEM_sharing_op: { xen_mem_sharing_op_t mso; diff --git a/xen/common/domctl.c b/xen/common/domctl.c index c326aba..489f84a 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -967,6 +968,14 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) } break; + case XEN_DOMCTL_mem_event_op: + { + ret = mem_event_domctl(d, &op->u.mem_event_op, + guest_handle_cast(u_domctl, void)); + copyback = 1; + } + break; + default: ret = arch_do_domctl(op, d, u_domctl); break; diff --git a/xen/common/memory.c b/xen/common/memory.c index cc8a3d0..4e530bf 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -969,6 +970,10 @@ long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) break; + case XENMEM_access_op: + rc = mem_access_memop(cmd, guest_handle_cast(arg, xen_mem_access_op_t)); + break; + default: rc = arch_memory_op(cmd, arg); break; -- 2.1.0.rc1