summaryrefslogtreecommitdiff
path: root/target-i386
diff options
context:
space:
mode:
authorGlauber Costa <glommer@redhat.com>2011-03-17 19:42:06 -0300
committerMarcelo Tosatti <mtosatti@redhat.com>2011-05-02 09:38:35 -0300
commit642258c6c7f386165bc7e79dcd42040fd77df01e (patch)
treeb0af198a4df6671c073f10b87d2445be9b23f639 /target-i386
parente41e0fc61ae776b9235380fe9570af31ea7bbc86 (diff)
downloadqemu-642258c6c7f386165bc7e79dcd42040fd77df01e.zip
kvm: add kvmclock to its second bit
We have two bits that can represent kvmclock in cpuid. They signal the guest which msr set to use. When we tweak flags involving this value - specially when we use "-", we have to act on both. Signed-off-by: Glauber Costa <glommer@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'target-i386')
-rw-r--r--target-i386/cpuid.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/target-i386/cpuid.c b/target-i386/cpuid.c
index 0ac592f0c1..e479a4dbd7 100644
--- a/target-i386/cpuid.c
+++ b/target-i386/cpuid.c
@@ -73,7 +73,7 @@ static const char *ext3_feature_name[] = {
};
static const char *kvm_feature_name[] = {
- "kvmclock", "kvm_nopiodelay", "kvm_mmu", NULL, "kvm_asyncpf", NULL, NULL, NULL,
+ "kvmclock", "kvm_nopiodelay", "kvm_mmu", "kvmclock", "kvm_asyncpf", NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,