Re: [Xen-devel] [PATCH V8 00/12] xen: Clean-up of mem_event subsystem

[Tim Deegan <tim@xxxxxxx>]

Hi, 

Sorry for the delay - I have been away.

At 22:06 +0100 on 26 Mar (1427407612), Tamas K Lengyel wrote:
> Tamas K Lengyel (12):
>   xen/mem_event: Cleanup of mem_event structures
>   xen/mem_event: Cleanup mem_event names in rings, functions and domctls
>   xen/mem_paging: Convert mem_event_op to mem_paging_op and cleanup
>   xen: Rename mem_event to vm_event
>   tools/tests: Clean-up tools/tests/xen-access
>   x86/hvm: factor out and rename vm_event related functions

I have applied these six patches.

>   xen: Introduce monitor_op domctl

This one no longer applies cleanly - looks like a conflict with a7511905
("xen: Extend DOMCTL createdomain to support arch configuration")

Can you rebase the second half of the series please?

Cheers,

Tim.

>   xen/vm_event: Deprecate VM_EVENT_FLAG_DUMMY flag
>   xen/vm_event: Decouple vm_event and mem_access.
>   xen/vm_event: Relocate memop checks
>   xen/xsm: Split vm_event_op into three separate labels
>   xen/vm_event: Add RESUME option to vm_event_op domctl
> 
>  MAINTAINERS                                    |   6 +-
>  docs/misc/xsm-flask.txt                        |   2 +-
>  tools/libxc/Makefile                           |   3 +-
>  tools/libxc/include/xenctrl.h                  |  59 ++-
>  tools/libxc/xc_domain.c                        |  28 +-
>  tools/libxc/xc_domain_restore.c                |  14 +-
>  tools/libxc/xc_domain_save.c                   |   4 +-
>  tools/libxc/xc_hvm_build_x86.c                 |   2 +-
>  tools/libxc/xc_mem_access.c                    |  56 ++-
>  tools/libxc/xc_mem_paging.c                    |  80 ++--
>  tools/libxc/xc_memshr.c                        |  29 +-
>  tools/libxc/xc_monitor.c                       | 137 +++++++
>  tools/libxc/xc_private.h                       |  15 +-
>  tools/libxc/{xc_mem_event.c => xc_vm_event.c}  |  59 +--
>  tools/libxc/xg_save_restore.h                  |   2 +-
>  tools/tests/xen-access/xen-access.c            | 264 +++++--------
>  tools/xenpaging/pagein.c                       |   2 +-
>  tools/xenpaging/xenpaging.c                    | 155 ++++----
>  tools/xenpaging/xenpaging.h                    |   8 +-
>  xen/arch/x86/Makefile                          |   1 +
>  xen/arch/x86/domain.c                          |   2 +-
>  xen/arch/x86/domctl.c                          |   4 +-
>  xen/arch/x86/hvm/Makefile                      |   3 +-
>  xen/arch/x86/hvm/emulate.c                     |   8 +-
>  xen/arch/x86/hvm/event.c                       | 196 ++++++++++
>  xen/arch/x86/hvm/hvm.c                         | 189 +--------
>  xen/arch/x86/hvm/vmx/vmcs.c                    |  11 +-
>  xen/arch/x86/hvm/vmx/vmx.c                     |   9 +-
>  xen/arch/x86/mm/hap/nested_ept.c               |   4 +-
>  xen/arch/x86/mm/hap/nested_hap.c               |   4 +-
>  xen/arch/x86/mm/mem_paging.c                   |  61 +--
>  xen/arch/x86/mm/mem_sharing.c                  | 180 ++++-----
>  xen/arch/x86/mm/p2m-pod.c                      |   4 +-
>  xen/arch/x86/mm/p2m-pt.c                       |   4 +-
>  xen/arch/x86/mm/p2m.c                          | 271 +++++++------
>  xen/arch/x86/monitor.c                         | 195 ++++++++++
>  xen/arch/x86/x86_64/compat/mm.c                |  24 +-
>  xen/arch/x86/x86_64/mm.c                       |  24 +-
>  xen/common/Makefile                            |  18 +-
>  xen/common/domain.c                            |  12 +-
>  xen/common/domctl.c                            |  17 +-
>  xen/common/mem_access.c                        |  55 +--
>  xen/common/{mem_event.c => vm_event.c}         | 505 
> +++++++++++++------------
>  xen/drivers/passthrough/pci.c                  |   2 +-
>  xen/include/asm-arm/monitor.h                  |  35 ++
>  xen/include/asm-arm/p2m.h                      |  22 +-
>  xen/include/asm-x86/domain.h                   |  26 +-
>  xen/include/asm-x86/hvm/domain.h               |   1 -
>  xen/include/asm-x86/hvm/emulate.h              |   2 +-
>  xen/include/asm-x86/hvm/event.h                |  40 ++
>  xen/include/asm-x86/hvm/hvm.h                  |  11 -
>  xen/include/asm-x86/mem_paging.h               |   5 +-
>  xen/include/asm-x86/mem_sharing.h              |   4 +-
>  xen/include/asm-x86/monitor.h                  |  31 ++
>  xen/include/asm-x86/p2m.h                      |  41 +-
>  xen/include/public/domctl.h                    | 113 ++++--
>  xen/include/public/hvm/params.h                |  11 +-
>  xen/include/public/memory.h                    |  27 +-
>  xen/include/public/{mem_event.h => vm_event.h} | 183 ++++++---
>  xen/include/xen/mem_access.h                   |  18 +-
>  xen/include/xen/p2m-common.h                   |   4 +-
>  xen/include/xen/sched.h                        |  28 +-
>  xen/include/xen/{mem_event.h => vm_event.h}    | 103 ++---
>  xen/include/xsm/dummy.h                        |  22 +-
>  xen/include/xsm/xsm.h                          |  35 +-
>  xen/xsm/dummy.c                                |  13 +-
>  xen/xsm/flask/hooks.c                          |  66 +++-
>  xen/xsm/flask/policy/access_vectors            |  12 +-
>  68 files changed, 2100 insertions(+), 1481 deletions(-)
>  create mode 100644 tools/libxc/xc_monitor.c
>  rename tools/libxc/{xc_mem_event.c => xc_vm_event.c} (70%)
>  create mode 100644 xen/arch/x86/hvm/event.c
>  create mode 100644 xen/arch/x86/monitor.c
>  rename xen/common/{mem_event.c => vm_event.c} (51%)
>  create mode 100644 xen/include/asm-arm/monitor.h
>  create mode 100644 xen/include/asm-x86/hvm/event.h
>  create mode 100644 xen/include/asm-x86/monitor.h
>  rename xen/include/public/{mem_event.h => vm_event.h} (37%)
>  rename xen/include/xen/{mem_event.h => vm_event.h} (40%)
> 
> -- 
> 2.1.4
> 

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