diff options
| author | Kyle Huey | 2016-11-29 21:40:37 +0100 |
|---|---|---|
| committer | Paolo Bonzini | 2016-12-08 15:31:03 +0100 |
| commit | 6a908b628cff81d3f1eb737327c8b726c8fdfd4e (patch) | |
| tree | 8464b25c1de2854c34db51cb1f32ed76035d9695 /arch/x86/kvm/vmx.c | |
| parent | Merge branch 'kvm-ppc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| download | kernel-qcow2-linux-6a908b628cff81d3f1eb737327c8b726c8fdfd4e.tar.gz kernel-qcow2-linux-6a908b628cff81d3f1eb737327c8b726c8fdfd4e.tar.xz kernel-qcow2-linux-6a908b628cff81d3f1eb737327c8b726c8fdfd4e.zip | |
KVM: x86: Add a return value to kvm_emulate_cpuid
Once skipping the emulated instruction can potentially trigger an exit to
userspace (via KVM_GUESTDBG_SINGLESTEP) kvm_emulate_cpuid will need to
propagate a return value.
Signed-off-by: Kyle Huey <khuey@kylehuey.com>
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
Diffstat (limited to 'arch/x86/kvm/vmx.c')
| -rw-r--r-- | arch/x86/kvm/vmx.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 0e86219e1856..e4af9699d726 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -5837,8 +5837,7 @@ static void vmx_set_dr7(struct kvm_vcpu *vcpu, unsigned long val) static int handle_cpuid(struct kvm_vcpu *vcpu) { - kvm_emulate_cpuid(vcpu); - return 1; + return kvm_emulate_cpuid(vcpu); } static int handle_rdmsr(struct kvm_vcpu *vcpu) |