diff options
author | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2006-10-12 17:53:51 +0100 |
---|---|---|
committer | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2006-10-12 17:53:51 +0100 |
commit | 6ed92e61108ed00aa0416ba40f2d509e0c9b9d6f (patch) | |
tree | c09cb6340493dd04791970768804c0c79b443baa | |
parent | b3ec0ca6b6b4f2d8ee68e7aa655be8a859b9125d (diff) | |
download | xen-6ed92e61108ed00aa0416ba40f2d509e0c9b9d6f.tar.gz xen-6ed92e61108ed00aa0416ba40f2d509e0c9b9d6f.tar.bz2 xen-6ed92e61108ed00aa0416ba40f2d509e0c9b9d6f.zip |
[HVM][SVM] Use proper name for the K8 VM_CR MSR.
Signed-off-by: Keir Fraser <keir@xensource.com>
-rw-r--r-- | xen/arch/x86/hvm/svm/svm.c | 7 | ||||
-rw-r--r-- | xen/include/asm-x86/msr.h | 8 |
2 files changed, 11 insertions, 4 deletions
diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index ca4f8d52ae..ffefba24fc 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -842,12 +842,13 @@ int start_svm(void) return 0; /* check whether SVM feature is disabled in BIOS */ - rdmsr(0xC0010114, eax, edx); - if ( eax & 0x00000010 ) { + rdmsr(MSR_K8_VM_CR, eax, edx); + if ( eax & K8_VMCR_SVME_DISABLE ) + { printk("AMD SVM Extension is disabled in BIOS.\n"); return 0; } - + if (!(hsa[cpu] = alloc_host_save_area())) return 0; diff --git a/xen/include/asm-x86/msr.h b/xen/include/asm-x86/msr.h index 07c09b2ae2..31e2afd8bf 100644 --- a/xen/include/asm-x86/msr.h +++ b/xen/include/asm-x86/msr.h @@ -302,8 +302,14 @@ static inline void wrmsrl(unsigned int msr, __u64 val) #define MSR_K8_TOP_MEM1 0xC001001A #define MSR_K8_TOP_MEM2 0xC001001D +#define MSR_K8_SYSCFG 0xC0010010 +#define MSR_K8_HWCR 0xC0010015 +#define MSR_K8_VM_CR 0xC0010114 #define MSR_K8_VM_HSAVE_PA 0xC0010117 -#define MSR_K8_SYSCFG 0xC0000010 + +/* MSR_K8_VM_CR bits: */ +#define _K8_VMCR_SVME_DISABLE 4 +#define K8_VMCR_SVME_DISABLE (1 << _K8_VMCR_SVME_DISABLE) /* Centaur-Hauls/IDT defined MSRs. */ #define MSR_IDT_FCR1 0x107 |