diff options
| author | Eddie Dong <eddie.dong@intel.com> | 2011-06-09 16:24:09 +0800 |
|---|---|---|
| committer | Eddie Dong <eddie.dong@intel.com> | 2011-06-09 16:24:09 +0800 |
| commit | b022030520d9f3b6cd6758b141127b1203d4b890 (patch) | |
| tree | 41116538715d891f075b610f34f862d5b873a655 | |
| parent | e130dea343056626957a4adb568064b967868dd0 (diff) | |
| download | xen-b022030520d9f3b6cd6758b141127b1203d4b890.tar.gz xen-b022030520d9f3b6cd6758b141127b1203d4b890.tar.bz2 xen-b022030520d9f3b6cd6758b141127b1203d4b890.zip | |
Nested VMX: Add data structure for nestedvmx
Signed-off-by: Qing He <qing.he@intel.com>
Signed-off-by: Eddie Dong <eddie.dong@intel.com>
Acked-by: Tim Deegan <Tim.Deegan@citrix.com>
Committed-by: Tim Deegan <Tim.Deegan@citrix.com>
| -rw-r--r-- | xen/include/asm-x86/hvm/vcpu.h | 2 | ||||
| -rw-r--r-- | xen/include/asm-x86/hvm/vmx/vvmx.h | 38 |
2 files changed, 40 insertions, 0 deletions
diff --git a/xen/include/asm-x86/hvm/vcpu.h b/xen/include/asm-x86/hvm/vcpu.h index 0282c01c3c..8c225a51eb 100644 --- a/xen/include/asm-x86/hvm/vcpu.h +++ b/xen/include/asm-x86/hvm/vcpu.h @@ -24,6 +24,7 @@ #include <asm/hvm/io.h> #include <asm/hvm/vlapic.h> #include <asm/hvm/vmx/vmcs.h> +#include <asm/hvm/vmx/vvmx.h> #include <asm/hvm/svm/vmcb.h> #include <asm/hvm/svm/nestedsvm.h> #include <asm/mtrr.h> @@ -57,6 +58,7 @@ struct nestedvcpu { /* SVM/VMX arch specific */ union { struct nestedsvm nsvm; + struct nestedvmx nvmx; } u; bool_t nv_flushp2m; /* True, when p2m table must be flushed */ diff --git a/xen/include/asm-x86/hvm/vmx/vvmx.h b/xen/include/asm-x86/hvm/vmx/vvmx.h new file mode 100644 index 0000000000..d4b9579a83 --- /dev/null +++ b/xen/include/asm-x86/hvm/vmx/vvmx.h @@ -0,0 +1,38 @@ + +/* + * vvmx.h: Support virtual VMX for nested virtualization. + * + * Copyright (c) 2010, Intel Corporation. + * Author: Qing He <qing.he@intel.com> + * Eddie Dong <eddie.dong@intel.com> + * + * 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, write to the Free Software Foundation, Inc., 59 Temple + * Place - Suite 330, Boston, MA 02111-1307 USA. + * + */ +#ifndef __ASM_X86_HVM_VVMX_H__ +#define __ASM_X86_HVM_VVMX_H__ + +struct nestedvmx { + paddr_t vmxon_region_pa; + void *iobitmap[2]; /* map (va) of L1 guest I/O bitmap */ + /* deferred nested interrupt */ + struct { + unsigned long intr_info; + u32 error_code; + } intr; +}; + +#define vcpu_2_nvmx(v) (vcpu_nestedhvm(v).u.nvmx) +#endif /* __ASM_X86_HVM_VVMX_H__ */ + |