VPMU: Make vpmu stucture visiable for both vmx and svm
PATCH 2/4 VPMU: Make vpmu stucture visiable for both vmx and svm
Signed-off-by Wei Wang <[email protected]>
Signature · 11 lines
AMD GmbH, Germany Operating System Research Center Legal Information: Advanced Micro Devices GmbH Karl-Hammerschmidt-Str. 34 85609 Dornach b. München Geschäftsführer: Andrew Bowd, Thomas M. McCoy, Giuliano Meroni Sitz: Dornach, Gemeinde Aschheim, Landkreis München Registergericht München, HRB Nr. 43632
xen/include/asm-x86/hvm/vcpu.h +3 -0
@@ -75,6 +75,9 @@ struct hvm_vcpu {u32 msr_tsc_aux; +/* VPMU */ +struct vpmu_struct vpmu; +union {struct arch_vmx_struct vmx;struct arch_svm_struct svm;
xen/include/asm-x86/hvm/vmx/vmcs.h +0 -3
@@ -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;
xen/include/asm-x86/hvm/vpmu.h +2 -2
@@ -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-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel