Mechanical renaming and relocation to the monitor subsystem. Signed-off-by: Tamas K Lengyel <ta...@tklengyel.com> --- Cc: Stefano Stabellini <sstabell...@kernel.org> Cc: Julien Grall <julien.gr...@arm.com> Cc: Jan Beulich <jbeul...@suse.com> Cc: Andrew Cooper <andrew.coop...@citrix.com> Cc: Razvan Cojocaru <rcojoc...@bitdefender.com> --- xen/arch/arm/hvm.c | 4 ++-- xen/arch/x86/hvm/hvm.c | 3 ++- xen/common/monitor.c | 17 +++++++++++++++++ xen/common/vm_event.c | 16 ---------------- xen/include/xen/monitor.h | 1 + xen/include/xen/vm_event.h | 2 -- 6 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/xen/arch/arm/hvm.c b/xen/arch/arm/hvm.c index c01123a..d999bde 100644 --- a/xen/arch/arm/hvm.c +++ b/xen/arch/arm/hvm.c @@ -22,7 +22,7 @@ #include <xen/errno.h> #include <xen/guest_access.h> #include <xen/sched.h> -#include <xen/vm_event.h> +#include <xen/monitor.h> #include <xsm/xsm.h> @@ -75,7 +75,7 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) arg) case HVMOP_guest_request_vm_event: if ( guest_handle_is_null(arg) ) - vm_event_monitor_guest_request(); + monitor_guest_request(); else rc = -EINVAL; break; diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 5040a5c..7bf6a36 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -37,6 +37,7 @@ #include <xen/mem_access.h> #include <xen/rangeset.h> #include <xen/vm_event.h> +#include <xen/monitor.h> #include <asm/shadow.h> #include <asm/hap.h> #include <asm/current.h> @@ -5704,7 +5705,7 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) arg) case HVMOP_guest_request_vm_event: if ( guest_handle_is_null(arg) ) - vm_event_monitor_guest_request(); + monitor_guest_request(); else rc = -EINVAL; break; diff --git a/xen/common/monitor.c b/xen/common/monitor.c index 7c3d1c8..436214a 100644 --- a/xen/common/monitor.c +++ b/xen/common/monitor.c @@ -21,6 +21,7 @@ #include <xen/monitor.h> #include <xen/sched.h> +#include <xen/vm_event.h> #include <xsm/xsm.h> #include <public/domctl.h> #include <asm/monitor.h> @@ -84,6 +85,22 @@ int monitor_domctl(struct domain *d, struct xen_domctl_monitor_op *mop) return 0; } +void monitor_guest_request(void) +{ + struct vcpu *curr = current; + struct domain *d = curr->domain; + + if ( d->monitor.guest_request_enabled ) + { + vm_event_request_t req = { + .reason = VM_EVENT_REASON_GUEST_REQUEST, + .vcpu_id = curr->vcpu_id, + }; + + vm_event_monitor_traps(curr, d->monitor.guest_request_sync, &req); + } +} + /* * Local variables: * mode: C diff --git a/xen/common/vm_event.c b/xen/common/vm_event.c index 2906407..a489c04 100644 --- a/xen/common/vm_event.c +++ b/xen/common/vm_event.c @@ -824,22 +824,6 @@ int vm_event_monitor_traps(struct vcpu *v, uint8_t sync, return 1; } -void vm_event_monitor_guest_request(void) -{ - struct vcpu *curr = current; - struct domain *d = curr->domain; - - if ( d->monitor.guest_request_enabled ) - { - vm_event_request_t req = { - .reason = VM_EVENT_REASON_GUEST_REQUEST, - .vcpu_id = curr->vcpu_id, - }; - - vm_event_monitor_traps(curr, d->monitor.guest_request_sync, &req); - } -} - /* * Local variables: * mode: C diff --git a/xen/include/xen/monitor.h b/xen/include/xen/monitor.h index 7015e6d..204d5cc 100644 --- a/xen/include/xen/monitor.h +++ b/xen/include/xen/monitor.h @@ -26,5 +26,6 @@ struct domain; struct xen_domctl_monitor_op; int monitor_domctl(struct domain *d, struct xen_domctl_monitor_op *op); +void monitor_guest_request(void); #endif /* __XEN_MONITOR_H__ */ diff --git a/xen/include/xen/vm_event.h b/xen/include/xen/vm_event.h index beda9fe..89e6243 100644 --- a/xen/include/xen/vm_event.h +++ b/xen/include/xen/vm_event.h @@ -81,8 +81,6 @@ void vm_event_vcpu_unpause(struct vcpu *v); int vm_event_monitor_traps(struct vcpu *v, uint8_t sync, vm_event_request_t *req); -void vm_event_monitor_guest_request(void); - #endif /* __VM_EVENT_H__ */ -- 2.8.1 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel