Skip to content

Commit

Permalink
KVM: SVM: Return correct values in nested_svm_exit_handled_msr
Browse files Browse the repository at this point in the history
The nested_svm_exit_handled_msr() returned an bool which is
a bug. I worked by accident because the exected integer
return values match with the true and false values. This
patch changes the return value to int and let the function
return the correct values.

Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
  • Loading branch information
Joerg Roedel authored and Avi Kivity committed May 17, 2010
1 parent 0fc5c3a commit d247782
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions arch/x86/kvm/svm.c
Original file line number Diff line number Diff line change
Expand Up @@ -1552,16 +1552,16 @@ static void nested_svm_unmap(struct page *page)
kvm_release_page_dirty(page);
}

static bool nested_svm_exit_handled_msr(struct vcpu_svm *svm)
static int nested_svm_exit_handled_msr(struct vcpu_svm *svm)
{
u32 param = svm->vmcb->control.exit_info_1 & 1;
u32 msr = svm->vcpu.arch.regs[VCPU_REGS_RCX];
bool ret = false;
u32 t0, t1;
int ret;
u8 val;

if (!(svm->nested.intercept & (1ULL << INTERCEPT_MSR_PROT)))
return false;
return NESTED_EXIT_HOST;

switch (msr) {
case 0 ... 0x1fff:
Expand All @@ -1579,12 +1579,12 @@ static bool nested_svm_exit_handled_msr(struct vcpu_svm *svm)
t0 %= 8;
break;
default:
ret = true;
ret = NESTED_EXIT_DONE;
goto out;
}

if (!kvm_read_guest(svm->vcpu.kvm, svm->nested.vmcb_msrpm + t1, &val, 1))
ret = val & ((1 << param) << t0);
ret = val & ((1 << param) << t0) ? NESTED_EXIT_DONE : NESTED_EXIT_HOST;

out:
return ret;
Expand Down

0 comments on commit d247782

Please sign in to comment.