diff options
-rw-r--r-- | xen/arch/x86/crash.c | 2 | ||||
-rw-r--r-- | xen/arch/x86/hvm/hvm.c | 6 | ||||
-rw-r--r-- | xen/arch/x86/smp.c | 2 | ||||
-rw-r--r-- | xen/include/asm-x86/hvm/hvm.h | 9 | ||||
-rw-r--r-- | xen/include/asm-x86/hvm/support.h | 1 |
5 files changed, 9 insertions, 11 deletions
diff --git a/xen/arch/x86/crash.c b/xen/arch/x86/crash.c index cae1768633..57e3af4d71 100644 --- a/xen/arch/x86/crash.c +++ b/xen/arch/x86/crash.c @@ -25,7 +25,7 @@ #include <xen/sched.h> #include <public/xen.h> #include <asm/shared.h> -#include <asm/hvm/hvm.h> +#include <asm/hvm/support.h> static atomic_t waiting_for_crash_ipi; static unsigned int crashing_cpu; diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 326f3c0ed3..453c4ff355 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -76,6 +76,12 @@ void hvm_enable(struct hvm_function_table *fns) hvm_enabled = 1; } +void hvm_disable(void) +{ + if ( hvm_enabled ) + hvm_funcs.disable(); +} + void hvm_stts(struct vcpu *v) { /* FPU state already dirty? Then no need to setup_fpu() lazily. */ diff --git a/xen/arch/x86/smp.c b/xen/arch/x86/smp.c index cc6739abea..072927cd6c 100644 --- a/xen/arch/x86/smp.c +++ b/xen/arch/x86/smp.c @@ -21,7 +21,7 @@ #include <asm/smpboot.h> #include <asm/hardirq.h> #include <asm/ipi.h> -#include <asm/hvm/hvm.h> +#include <asm/hvm/support.h> #include <mach_apic.h> /* diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index 210ebe1164..3d3aa35683 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -140,15 +140,6 @@ struct hvm_function_table { extern struct hvm_function_table hvm_funcs; -/* - * For convenience, we use short hands. - */ -static inline void -hvm_disable(void) -{ - hvm_funcs.disable(); -} - int hvm_domain_initialise(struct domain *d); void hvm_domain_destroy(struct domain *d); diff --git a/xen/include/asm-x86/hvm/support.h b/xen/include/asm-x86/hvm/support.h index 6e43a0301c..d8930ed3c0 100644 --- a/xen/include/asm-x86/hvm/support.h +++ b/xen/include/asm-x86/hvm/support.h @@ -258,6 +258,7 @@ extern char hvm_io_bitmap[]; extern int hvm_enabled; void hvm_enable(struct hvm_function_table *); +void hvm_disable(void); int hvm_copy_to_guest_phys(paddr_t paddr, void *buf, int size); int hvm_copy_from_guest_phys(void *buf, paddr_t paddr, int size); |