diff --git a/[refs] b/[refs] index 7271953cf51f..9e22a26dc992 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ac6c2bc592b90c7f140fc87c49e21bc82376e2aa +refs/heads/master: d92899a0014aa795c21d3cf726ef5ff7684399f4 diff --git a/trunk/drivers/kvm/svm.c b/trunk/drivers/kvm/svm.c index 6b4de4f6c08d..4fa50bd0dceb 100644 --- a/trunk/drivers/kvm/svm.c +++ b/trunk/drivers/kvm/svm.c @@ -528,7 +528,13 @@ static void init_vmcb(struct vmcb *vmcb) save->cs.attrib = SVM_SELECTOR_READ_MASK | SVM_SELECTOR_P_MASK | SVM_SELECTOR_S_MASK | SVM_SELECTOR_CODE_MASK; save->cs.limit = 0xffff; - save->cs.base = 0xffff0000; + /* + * cs.base should really be 0xffff0000, but vmx can't handle that, so + * be consistent with it. + * + * Replace when we have real mode working for vmx. + */ + save->cs.base = 0xf0000; save->gdtr.limit = 0xffff; save->idtr.limit = 0xffff;