Mailing List Archive

# HG changeset patch
# User Keir Fraser <keir.fraser@citrix.com>
# Date 1273737341 -3600
# Node ID b8dc98dc6c40f9138339d5bd8aa0e519a8786f1c
# Parent 62eb5204a86fcde9be66f7f165cae8bab0c914aa
VPMU: Make vpmu stucture visiable for both vmx and svm

Signed-off-by: Wei Wang <wei.wang2@amd.com>
---
xen/include/asm-x86/hvm/vcpu.h | 3 +++
xen/include/asm-x86/hvm/vmx/vmcs.h | 3 ---
xen/include/asm-x86/hvm/vpmu.h | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)

diff -r 62eb5204a86f -r b8dc98dc6c40 xen/include/asm-x86/hvm/vcpu.h
--- a/xen/include/asm-x86/hvm/vcpu.h Thu May 13 08:55:06 2010 +0100
+++ b/xen/include/asm-x86/hvm/vcpu.h Thu May 13 08:55:41 2010 +0100
@@ -76,6 +76,9 @@ struct hvm_vcpu {

u32 msr_tsc_aux;

+ /* VPMU */
+ struct vpmu_struct vpmu;
+
union {
struct arch_vmx_struct vmx;
struct arch_svm_struct svm;
diff -r 62eb5204a86f -r b8dc98dc6c40 xen/include/asm-x86/hvm/vmx/vmcs.h
--- a/xen/include/asm-x86/hvm/vmx/vmcs.h Thu May 13 08:55:06 2010 +0100
+++ b/xen/include/asm-x86/hvm/vmx/vmcs.h Thu May 13 08:55:41 2010 +0100
@@ -90,9 +90,6 @@ struct arch_vmx_struct {
/* Cache of cpu execution control. */
u32 exec_control;
u32 secondary_exec_control;
-
- /* PMU */
- struct vpmu_struct vpmu;

#ifdef __x86_64__
struct vmx_msr_state msr_state;
diff -r 62eb5204a86f -r b8dc98dc6c40 xen/include/asm-x86/hvm/vpmu.h
--- a/xen/include/asm-x86/hvm/vpmu.h Thu May 13 08:55:06 2010 +0100
+++ b/xen/include/asm-x86/hvm/vpmu.h Thu May 13 08:55:41 2010 +0100
@@ -23,9 +23,9 @@
#define __ASM_X86_HVM_VPMU_H_

#define msraddr_to_bitpos(x) (((x)&0xffff) + ((x)>>31)*0x2000)
-#define vcpu_vpmu(vcpu) (&(vcpu)->arch.hvm_vcpu.u.vmx.vpmu)
+#define vcpu_vpmu(vcpu) (&((vcpu)->arch.hvm_vcpu.vpmu))
#define vpmu_vcpu(vpmu) (container_of((vpmu), struct vcpu, \
- arch.hvm_vcpu.u.vmx.vpmu))
+ arch.hvm_vcpu.vpmu))
#define vpmu_domain(vpmu) (vpmu_vcpu(vpmu)->domain)

#define MSR_TYPE_COUNTER 0

_______________________________________________
Xen-changelog mailing list
Xen-changelog@lists.xensource.com
http://lists.xensource.com/xen-changelog