@@ -3,7 +3,7 @@ subdir-y += vmx
obj-y += asid.o
obj-y += emulate.o
-obj-y += event_x86.o
+obj-y += event.o
obj-y += hpet.o
obj-y += hvm.o
obj-y += i8254.o
similarity index 98%
rename from xen/arch/x86/hvm/event_x86.c
rename to xen/arch/x86/hvm/event.c
@@ -1,5 +1,5 @@
/*
- * arch/x86/hvm/event_x86.c
+ * arch/x86/hvm/event.c
*
* Arch-specific hardware virtual machine event abstractions.
*
@@ -59,7 +59,7 @@
#include <asm/hvm/cacheattr.h>
#include <asm/hvm/trace.h>
#include <asm/hvm/nestedhvm.h>
-#include <asm/hvm/event_arch.h>
+#include <asm/hvm/event.h>
#include <asm/hvm/vmx/vmx.h>
#include <asm/hvm/svm/svm.h> /* for cpu_has_tsc_ratio */
#include <asm/altp2m.h>
@@ -1,30 +1,30 @@
/*
-* xen/common/hvm/event.c
-*
-* Common hardware virtual machine event abstractions.
-*
-* Copyright (c) 2004, Intel Corporation.
-* Copyright (c) 2005, International Business Machines Corporation.
-* Copyright (c) 2008, Citrix Systems, Inc.
-* Copyright (c) 2016, Bitdefender S.R.L.
-*
-* This program is free software; you can redistribute it and/or modify it
-* under the terms and conditions of the GNU General Public License,
-* version 2, as published by the Free Software Foundation.
-*
-* This program is distributed in the hope it will be useful, but WITHOUT
-* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-* more details.
-*
-* You should have received a copy of the GNU General Public License along with
-* this program; If not, see <http://www.gnu.org/licenses/>.
-*/
+ * xen/common/hvm/event.c
+ *
+ * Common hardware virtual machine event abstractions.
+ *
+ * Copyright (c) 2004, Intel Corporation.
+ * Copyright (c) 2005, International Business Machines Corporation.
+ * Copyright (c) 2008, Citrix Systems, Inc.
+ * Copyright (c) 2016, Bitdefender S.R.L.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; If not, see <http://www.gnu.org/licenses/>.
+ */
#include <xen/hvm/event.h>
#include <xen/vm_event.h> /* for vm_event_# calls */
#include <xen/monitor.h>
-#include <asm/hvm/event_arch.h> /* for hvm_event_arch_# calls */
+#include <asm/hvm/event.h> /* for hvm_event_arch_# calls */
#if CONFIG_X86
#include <asm/altp2m.h>
#endif
similarity index 86%
rename from xen/include/asm-arm/hvm/event_arch.h
rename to xen/include/asm-arm/hvm/event.h
@@ -1,5 +1,5 @@
/*
- * include/asm-arm/hvm/event_arch.h
+ * include/asm-arm/hvm/event.h
*
* Arch-specific hardware virtual machine event abstractions.
*
@@ -18,8 +18,8 @@
* this program; If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __ASM_ARM_HVM_EVENT_ARCH_H__
-#define __ASM_ARM_HVM_EVENT_ARCH_H__
+#ifndef __ASM_ARM_HVM_EVENT_H__
+#define __ASM_ARM_HVM_EVENT_H__
static inline
void arch_hvm_event_fill_regs(vm_event_request_t *req)
@@ -27,7 +27,7 @@ void arch_hvm_event_fill_regs(vm_event_request_t *req)
/* Not supported on ARM. */
}
-#endif /* __ASM_ARM_HVM_EVENT_ARCH_H__ */
+#endif /* __ASM_ARM_HVM_EVENT_H__ */
/*
* Local variables:
similarity index 94%
rename from xen/include/asm-x86/hvm/event_arch.h
rename to xen/include/asm-x86/hvm/event.h
@@ -1,5 +1,5 @@
/*
- * include/asm-x86/hvm/event_arch.h
+ * include/asm-x86/hvm/event.h
*
* Arch-specific hardware virtual machine event abstractions.
*
@@ -18,8 +18,8 @@
* this program; If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __ASM_X86_HVM_EVENT_ARCH_H__
-#define __ASM_X86_HVM_EVENT_ARCH_H__
+#ifndef __ASM_X86_HVM_EVENT_H__
+#define __ASM_X86_HVM_EVENT_H__
#include <xen/sched.h>
#include <xen/paging.h>
@@ -80,7 +80,7 @@ uint64_t arch_hvm_event_gfn_of_ip(unsigned long ip)
void hvm_event_msr(unsigned int msr, uint64_t value);
-#endif /* __ASM_X86_HVM_EVENT_ARCH_H__ */
+#endif /* __ASM_X86_HVM_EVENT_H__ */
/*
* Local variables:
@@ -26,7 +26,7 @@
#if CONFIG_HAS_VM_EVENT_WRITE_CTRLREG
/*
- * Called for current VCPU on crX/MSR changes by guest.
+ * Called for current VCPU on control-register changes by guest.
* The event might not fire if the client has subscribed to it in onchangeonly
* mode, hence the bool_t return type for control register write events.
*/
@@ -35,8 +35,8 @@ bool_t hvm_event_cr(unsigned int index,
unsigned long old);
#if CONFIG_X86
-#define hvm_event_crX(what, new, old) \
- hvm_event_cr(VM_EVENT_X86_##what, new, old)
+#define hvm_event_crX(cr, new, old) \
+ hvm_event_cr(VM_EVENT_X86_##cr, new, old)
#endif
#endif // HAS_VM_EVENT_WRITE_CTRLREG
Rename: - arch/x86/hvm/event_x86.c -> arch/x86/hvm/event.c - asm-{x86,arm}/hvm/event_arch.h -> asm-{x86/arm}/hvm/event.h (previous commit explains why these renames were necessary) Minor fixes: * xen/common/hvm/event.c: fix malformed file header comment * xen/hvm/event.h: fix comment & change hvm_event_crX first param name to a more descriptive one Signed-off-by: Corneliu ZUZU <czuzu@bitdefender.com> --- xen/arch/x86/hvm/Makefile | 2 +- xen/arch/x86/hvm/{event_x86.c => event.c} | 2 +- xen/arch/x86/hvm/hvm.c | 2 +- xen/common/hvm/event.c | 44 +++++++++++------------ xen/include/asm-arm/hvm/{event_arch.h => event.h} | 8 ++--- xen/include/asm-x86/hvm/{event_arch.h => event.h} | 8 ++--- xen/include/xen/hvm/event.h | 6 ++-- 7 files changed, 36 insertions(+), 36 deletions(-) rename xen/arch/x86/hvm/{event_x86.c => event.c} (98%) rename xen/include/asm-arm/hvm/{event_arch.h => event.h} (86%) rename xen/include/asm-x86/hvm/{event_arch.h => event.h} (94%)