Attachment #126962 for bug #187812

View | Details | Raw Unified | Return to bug 187812
Collapse All | Expand All

Lines 1735-1740 static void svm_inject_page_fault(struct kvm_vcpu *vcpu, Link Here

(-)a/drivers/kvm/svm.c (+6 lines)
1735		1735
1736	static int is_disabled(void)	1736	static int is_disabled(void)
1737	{	1737	{
		1738	u64 vm_cr;
		1739
		1740	rdmsrl(MSR_VM_CR, vm_cr);
		1741	if (vm_cr & (1 << SVM_VM_CR_SVM_DISABLE))
		1742	return 1;
		1743
1738	return 0;	1744	return 0;
1739	}	1745	}
1740		1746

Lines 175-182 struct __attribute__ ((__packed__)) vmcb { Link Here

(-)a/drivers/kvm/svm.h (+3 lines)
175	#define SVM_CPUID_FUNC 0x8000000a	175	#define SVM_CPUID_FUNC 0x8000000a
176		176
177	#define MSR_EFER_SVME_MASK (1ULL << 12)	177	#define MSR_EFER_SVME_MASK (1ULL << 12)
		178	#define MSR_VM_CR 0xc0010114
178	#define MSR_VM_HSAVE_PA 0xc0010117ULL	179	#define MSR_VM_HSAVE_PA 0xc0010117ULL
179		180
		181	#define SVM_VM_CR_SVM_DISABLE 4
		182
180	#define SVM_SELECTOR_S_SHIFT 4	183	#define SVM_SELECTOR_S_SHIFT 4
181	#define SVM_SELECTOR_DPL_SHIFT 5	184	#define SVM_SELECTOR_DPL_SHIFT 5
182	#define SVM_SELECTOR_P_SHIFT 7	185	#define SVM_SELECTOR_P_SHIFT 7

Return to bug 187812