diff options
| author | dfr <dfr@FreeBSD.org> | 2009-03-11 15:30:12 +0000 |
|---|---|---|
| committer | dfr <dfr@FreeBSD.org> | 2009-03-11 15:30:12 +0000 |
| commit | 598fb4217fe304b2d9dae488867c35e7213e3ba5 (patch) | |
| tree | 633dc40712503605071c68975d2c972638554000 /sys/xen/hypervisor.h | |
| parent | 2ee25eb1a489668e88e623440b968811e9f6d5b3 (diff) | |
| parent | 0b3e97d804d73af27fba381fd51fe0dd48a9cb06 (diff) | |
| download | FreeBSD-src-598fb4217fe304b2d9dae488867c35e7213e3ba5.zip FreeBSD-src-598fb4217fe304b2d9dae488867c35e7213e3ba5.tar.gz | |
Merge in support for Xen HVM on amd64 architecture.
Diffstat (limited to 'sys/xen/hypervisor.h')
| -rw-r--r-- | sys/xen/hypervisor.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/sys/xen/hypervisor.h b/sys/xen/hypervisor.h index 369b0c4..0d93f66 100644 --- a/sys/xen/hypervisor.h +++ b/sys/xen/hypervisor.h @@ -8,11 +8,19 @@ * $FreeBSD$ */ -#ifndef __HYPERVISOR_H__ -#define __HYPERVISOR_H__ +#ifndef __XEN_HYPERVISOR_H__ +#define __XEN_HYPERVISOR_H__ + +#ifdef XENHVM + +#define is_running_on_xen() (HYPERVISOR_shared_info != NULL) + +#else #define is_running_on_xen() 1 +#endif + #ifdef PAE #ifndef CONFIG_X86_PAE #define CONFIG_X86_PAE @@ -27,6 +35,7 @@ #include <xen/interface/physdev.h> #include <xen/interface/sched.h> #include <xen/interface/callback.h> +#include <xen/interface/memory.h> #include <machine/xen/hypercall.h> #if defined(__amd64__) @@ -131,7 +140,7 @@ MULTI_update_va_mapping( mcl->op = __HYPERVISOR_update_va_mapping; mcl->args[0] = va; #if defined(__amd64__) - mcl->args[1] = new_val.pte; + mcl->args[1] = new_val; #elif defined(PAE) mcl->args[1] = (uint32_t)(new_val & 0xffffffff) ; mcl->args[2] = (uint32_t)(new_val >> 32); @@ -142,4 +151,4 @@ MULTI_update_va_mapping( mcl->args[MULTI_UVMFLAGS_INDEX] = flags; } -#endif /* __HYPERVISOR_H__ */ +#endif /* __XEN_HYPERVISOR_H__ */ |
