xen: merge MSR_EFER
PATCH 1/1 xen: merge MSR_EFER
Hi!
Attached patch moves SVM and VMX specific MSR_EFER handling into hvm as neither SVM nor VMX do anything arch specific things.
Signed-off-by Christoph Egger <[email protected]>
Signature · 6 lines
---to satisfy European Law for business letters: Advanced Micro Devices GmbH Einsteinring 24, 85609 Dornach b. Muenchen Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen Registergericht Muenchen, HRB Nr. 43632
xen/arch/x86/hvm/hvm.c +9 -0
@@ -2039,6 +2039,10 @@ int hvm_msr_read_intercept(unsigned intswitch ( msr ) { +case MSR_EFER : + *msr_content = v->arch.hvm_vcpu.guest_efer; +break ; +case MSR_IA32_TSC : *msr_content =hvm_get_guest_tsc (v);break ;
@@ -2138,6 +2142,11 @@ int hvm_msr_write_intercept(unsigned intswitch ( msr ) { +case MSR_EFER : +if (hvm_set_efer (msr_content) ) +return X86EMUL_EXCEPTION ; +break ; +case MSR_IA32_TSC :hvm_set_guest_tsc (v, msr_content);break ;
xen/arch/x86/hvm/svm/svm.c +0 -9
@@ -116,11 +116,6 @@ long_mode_do_msr_write(unsigned int msr,switch ( msr ) { -case MSR_EFER : -if (hvm_set_efer (msr_content) ) -return HNDL_exception_raised; -break ; -case MSR_IA32_MC4_MISC :/* Threshold register */ case MSR_F10_MC4_MISC1 ... MSR_F10_MC4_MISC3:/*
@@ -1042,10 +1037,6 @@ static int svm_msr_read_intercept(unsignswitch ( msr ) { -case MSR_EFER : - *msr_content = v->arch.hvm_vcpu.guest_efer; -break ; -case MSR_IA32_SYSENTER_CS : *msr_content = v->arch.hvm_svm.guest_sysenter_cs;break ;
xen/arch/x86/hvm/vmx/vmx.c +1 -22
@@ -172,10 +172,6 @@ long_mode_do_msr_read(unsigned int msr,switch ( msr ) { -case MSR_EFER : - *msr_content = v->arch.hvm_vcpu.guest_efer; -break ; -case MSR_FS_BASE : *msr_content =__vmread (GUEST_FS_BASE );break ;
@@ -224,11 +220,6 @@ long_mode_do_msr_write(unsigned int msr,switch ( msr ) { -case MSR_EFER : -if (hvm_set_efer (msr_content) ) - goto exception_raised; -break ; -case MSR_FS_BASE :case MSR_GS_BASE :case MSR_SHADOW_GS_BASE :
@@ -270,7 +261,6 @@ long_mode_do_msr_write(unsigned int msr, uncanonical_address:HVM_DBG_LOG (DBG_LEVEL_0 ,"Not cano address of msr write %x" , msr);vmx_inject_hw_exception (TRAP_gp_fault,0 ); - exception_raised:return HNDL_exception_raised; }
@@ -369,18 +359,7 @@ long_mode_do_msr_read(unsigned int msr,static enum handler_return long_mode_do_msr_write (unsigned int msr,uint64_t msr_content) { -switch ( msr ) - { -case MSR_EFER : -if (hvm_set_efer (msr_content) ) -return HNDL_exception_raised; -break ; - -default : -return HNDL_unhandled; - } - -return HNDL_done; +return HNDL_unhandled; }#endif /* __i386__ */
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel
Quoted 5 lines · On Monday 06 September 2010 12:47:37 Christoph Egger wrote:
Hi!
Attached patch moves SVM and VMX specific
MSR_EFERhandling into hvm as neither SVM nor VMX do anything arch specific things.
Previous patch did not compile for 32bit. New version attached.
Signed-off-by Christoph Egger <[email protected]>
Signature · 6 lines
---to satisfy European Law for business letters: Advanced Micro Devices GmbH Einsteinring 24, 85609 Dornach b. Muenchen Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen Registergericht Muenchen, HRB Nr. 43632
xen/arch/x86/hvm/hvm.c +9 -0
@@ -2039,6 +2039,10 @@ int hvm_msr_read_intercept(unsigned intswitch ( msr ) { +case MSR_EFER : + *msr_content = v->arch.hvm_vcpu.guest_efer; +break ; +case MSR_IA32_TSC : *msr_content =hvm_get_guest_tsc (v);break ;
@@ -2138,6 +2142,11 @@ int hvm_msr_write_intercept(unsigned intswitch ( msr ) { +case MSR_EFER : +if (hvm_set_efer (msr_content) ) +return X86EMUL_EXCEPTION ; +break ; +case MSR_IA32_TSC :hvm_set_guest_tsc (v, msr_content);break ;
xen/arch/x86/hvm/svm/svm.c +0 -9
@@ -116,11 +116,6 @@ long_mode_do_msr_write(unsigned int msr,switch ( msr ) { -case MSR_EFER : -if (hvm_set_efer (msr_content) ) -return HNDL_exception_raised; -break ; -case MSR_IA32_MC4_MISC :/* Threshold register */ case MSR_F10_MC4_MISC1 ... MSR_F10_MC4_MISC3:/*
@@ -1042,10 +1037,6 @@ static int svm_msr_read_intercept(unsignswitch ( msr ) { -case MSR_EFER : - *msr_content = v->arch.hvm_vcpu.guest_efer; -break ; -case MSR_IA32_SYSENTER_CS : *msr_content = v->arch.hvm_svm.guest_sysenter_cs;break ;
xen/arch/x86/hvm/vmx/vmx.c +2 -35
@@ -172,10 +172,6 @@ long_mode_do_msr_read(unsigned int msr,switch ( msr ) { -case MSR_EFER : - *msr_content = v->arch.hvm_vcpu.guest_efer; -break ; -case MSR_FS_BASE : *msr_content =__vmread (GUEST_FS_BASE );break ;
@@ -224,11 +220,6 @@ long_mode_do_msr_write(unsigned int msr,switch ( msr ) { -case MSR_EFER : -if (hvm_set_efer (msr_content) ) - goto exception_raised; -break ; -case MSR_FS_BASE :case MSR_GS_BASE :case MSR_SHADOW_GS_BASE :
@@ -270,7 +261,6 @@ long_mode_do_msr_write(unsigned int msr, uncanonical_address:HVM_DBG_LOG (DBG_LEVEL_0 ,"Not cano address of msr write %x" , msr);vmx_inject_hw_exception (TRAP_gp_fault,0 ); - exception_raised:return HNDL_exception_raised; }
@@ -351,36 +341,13 @@ void vmx_save_host_msrs(void) {}static enum handler_return long_mode_do_msr_read (unsigned int msr,uint64_t *msr_content) { -struct vcpu *v = current; - -switch ( msr ) - { -case MSR_EFER : - *msr_content = v->arch.hvm_vcpu.guest_efer; -break ; - -default : -return HNDL_unhandled; - } - -return HNDL_done; +return HNDL_unhandled; }static enum handler_return long_mode_do_msr_write (unsigned int msr,uint64_t msr_content) { -switch ( msr ) - { -case MSR_EFER : -if (hvm_set_efer (msr_content) ) -return HNDL_exception_raised; -break ; - -default : -return HNDL_unhandled; - } - -return HNDL_done; +return HNDL_unhandled; }#endif /* __i386__ */
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel