In this commit, we rename the function "p2m_altp2m_check" to "altp2m_check". This is a preparation measure for the following commit which moves the renamed function "altp2m_check" from p2m.c to altp2m.c in order to group all altp2m-related functions to one spot (which is altp2m.c). The reason for modifying the function's name is due the association of the function with the associated .c file.
Signed-off-by: Sergej Proskurin <prosku...@sec.in.tum.de> --- Cc: Jan Beulich <jbeul...@suse.com> Cc: Andrew Cooper <andrew.coop...@citrix.com> Cc: Razvan Cojocaru <rcojoc...@bitdefender.com> Cc: Tamas K Lengyel <ta...@tklengyel.com> Cc: Stefano Stabellini <sstabell...@kernel.org> Cc: Julien Grall <julien.gr...@arm.com> --- v4: In this commit, we have pulled the renaming of the function "p2m_altp2m_check" out of the previous commit "altp2m: Introduce altp2m_switch_vcpu_altp2m_by_id" --- xen/arch/x86/mm/p2m.c | 2 +- xen/common/vm_event.c | 2 +- xen/include/asm-arm/p2m.h | 2 +- xen/include/asm-x86/p2m.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index e8a57d118c..d5038ed66b 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1687,7 +1687,7 @@ void p2m_mem_paging_resume(struct domain *d, vm_event_response_t *rsp) } } -void p2m_altp2m_check(struct vcpu *v, uint16_t idx) +void altp2m_check(struct vcpu *v, uint16_t idx) { if ( altp2m_active(v->domain) ) p2m_switch_vcpu_altp2m_by_id(v, idx); diff --git a/xen/common/vm_event.c b/xen/common/vm_event.c index 9291db61c5..42e6f09029 100644 --- a/xen/common/vm_event.c +++ b/xen/common/vm_event.c @@ -418,7 +418,7 @@ void vm_event_resume(struct domain *d, struct vm_event_domain *ved) /* Check for altp2m switch */ if ( rsp.flags & VM_EVENT_FLAG_ALTERNATE_P2M ) - p2m_altp2m_check(v, rsp.altp2m_idx); + altp2m_check(v, rsp.altp2m_idx); if ( rsp.flags & VM_EVENT_FLAG_SET_REGISTERS ) vm_event_set_registers(v, &rsp); diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h index d3467daacf..5564473e26 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -186,7 +186,7 @@ typedef enum { p2m_to_mask(p2m_map_foreign))) static inline -void p2m_altp2m_check(struct vcpu *v, uint16_t idx) +void altp2m_check(struct vcpu *v, uint16_t idx) { /* Not supported on ARM. */ } diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index 6395e8fd1d..d1cc65f86d 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -804,7 +804,7 @@ static inline struct p2m_domain *p2m_get_altp2m(struct vcpu *v) bool_t p2m_switch_vcpu_altp2m_by_id(struct vcpu *v, unsigned int idx); /* Check to see if vcpu should be switched to a different p2m. */ -void p2m_altp2m_check(struct vcpu *v, uint16_t idx); +void altp2m_check(struct vcpu *v, uint16_t idx); /* Flush all the alternate p2m's for a domain */ void p2m_flush_altp2m(struct domain *d); -- 2.13.3 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel