diff options
| author | Sheng Yang | 2009-12-18 09:48:47 +0100 |
|---|---|---|
| committer | Marcelo Tosatti | 2010-03-01 16:35:40 +0100 |
| commit | 4e47c7a6d714cf352b719db92a924b6ec487acc5 (patch) | |
| tree | b968765b85124e0b59f415bf8e4d499ef953236e /arch/x86/kvm/x86.c | |
| parent | KVM: Add cpuid_update() callback to kvm_x86_ops (diff) | |
| download | kernel-qcow2-linux-4e47c7a6d714cf352b719db92a924b6ec487acc5.tar.gz kernel-qcow2-linux-4e47c7a6d714cf352b719db92a924b6ec487acc5.tar.xz kernel-qcow2-linux-4e47c7a6d714cf352b719db92a924b6ec487acc5.zip | |
KVM: VMX: Add instruction rdtscp support for guest
Before enabling, execution of "rdtscp" in guest would result in #UD.
Signed-off-by: Sheng Yang <sheng@linux.intel.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm/x86.c')
| -rw-r--r-- | arch/x86/kvm/x86.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index e5ac21f992f0..8798504ace11 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -1646,6 +1646,7 @@ static void do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function, #else unsigned f_lm = 0; #endif + unsigned f_rdtscp = kvm_x86_ops->rdtscp_supported() ? F(RDTSCP) : 0; /* cpuid 1.edx */ const u32 kvm_supported_word0_x86_features = @@ -1665,7 +1666,7 @@ static void do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function, F(MTRR) | F(PGE) | F(MCA) | F(CMOV) | F(PAT) | F(PSE36) | 0 /* Reserved */ | f_nx | 0 /* Reserved */ | F(MMXEXT) | F(MMX) | - F(FXSR) | F(FXSR_OPT) | f_gbpages | 0 /* RDTSCP */ | + F(FXSR) | F(FXSR_OPT) | f_gbpages | f_rdtscp | 0 /* Reserved */ | f_lm | F(3DNOWEXT) | F(3DNOW); /* cpuid 1.ecx */ const u32 kvm_supported_word4_x86_features = |