Re: [Xen-devel] [PATCH v5 04/17] xen: Relocate mem_event_op domctl and access_op memop into common.

["Jan Beulich" <JBeulich@xxxxxxxx>]

>>> On 10.09.14 at 15:28, <tklengyel@xxxxxxxxxxxxx> wrote:
> Signed-off-by: Tamas K Lengyel <tklengyel@xxxxxxxxxxxxx>

Acked-by: Jan Beulich <jbeulich@xxxxxxxx>

> ---
> v5: Move memop compat into common as well.
>     Position domctl in switch relative to the domctl #.
> v4: Don't remove memop handling from x86_64/compat and style fixes.
> ---
>  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/compat/memory.c      | 5 +++++
>  xen/common/domctl.c             | 7 +++++++
>  xen/common/memory.c             | 5 +++++
>  6 files changed, 17 insertions(+), 16 deletions(-)
> 
> diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c
> index 26a3ea1..166cfb3 100644
> --- a/xen/arch/x86/domctl.c
> +++ b/xen/arch/x86/domctl.c
> @@ -1131,14 +1131,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 c079702..54f25b7 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 0da6ddc..0aaa460 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/compat/memory.c b/xen/common/compat/memory.c
> index 25dc016..43d02bc 100644
> --- a/xen/common/compat/memory.c
> +++ b/xen/common/compat/memory.c
> @@ -4,6 +4,7 @@
>  #include <xen/guest_access.h>
>  #include <xen/sched.h>
>  #include <xen/event.h>
> +#include <xen/mem_access.h>
>  #include <asm/current.h>
>  #include <compat/memory.h>
>  
> @@ -381,6 +382,10 @@ int compat_memory_op(unsigned int cmd, 
> XEN_GUEST_HANDLE_PARAM(void) compat)
>              break;
>          }
>  
> +        case XENMEM_access_op:
> +            rc = mem_access_memop(cmd, guest_handle_cast(compat, 
> xen_mem_access_op_t));
> +            break;
> +
>          case XENMEM_add_to_physmap_batch:
>              start_extent = end_extent;
>              break;
> diff --git a/xen/common/domctl.c b/xen/common/domctl.c
> index 222b140..638080f 100644
> --- a/xen/common/domctl.c
> +++ b/xen/common/domctl.c
> @@ -24,6 +24,7 @@
>  #include <xen/bitmap.h>
>  #include <xen/paging.h>
>  #include <xen/hypercall.h>
> +#include <xen/mem_event.h>
>  #include <asm/current.h>
>  #include <asm/irq.h>
>  #include <asm/page.h>
> @@ -1126,6 +1127,12 @@ 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;
> +
>      case XEN_DOMCTL_disable_migrate:
>      {
>          d->disable_migrate = op->u.disable_migrate.disable;
> diff --git a/xen/common/memory.c b/xen/common/memory.c
> index 44a8106..98b1ee6 100644
> --- a/xen/common/memory.c
> +++ b/xen/common/memory.c
> @@ -25,6 +25,7 @@
>  #include <asm/hardirq.h>
>  #include <asm/p2m.h>
>  #include <xen/numa.h>
> +#include <xen/mem_access.h>
>  #include <public/memory.h>
>  #include <xsm/xsm.h>
>  #include <xen/trace.h>
> @@ -943,6 +944,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;
> +
>      case XENMEM_claim_pages:
>          if ( copy_from_guest(&reservation, arg, 1) )
>              return -EFAULT;
> -- 
> 2.1.0



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel