]> xenbits.xensource.com Git - qemu-xen-4.5-testing.git/commitdiff
kvm: add kvmclock to its second bit
authorGlauber Costa <glommer@redhat.com>
Thu, 17 Mar 2011 22:42:06 +0000 (19:42 -0300)
committerMarcelo Tosatti <mtosatti@redhat.com>
Mon, 2 May 2011 12:38:35 +0000 (09:38 -0300)
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>
target-i386/cpuid.c

index 0ac592f0c1bab8a3b9fe655264f86af56b17e596..e479a4dbd7b3c2792903783542136a50da8acb9e 100644 (file)
@@ -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,