From 0856579cac2f1dacecd847cfcd89680d26ff78f5 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Tue, 3 Mar 2015 00:29:17 +0000 Subject: Revert "Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging" This reverts commit b8a173b25c887a606681fc35a46702c164d5b2d0, reversing changes made to 5de090464f1ec5360c4f30faa01d8a9f8826cd58. (I applied this pull request when I should not have done so, and am now immediately reverting it.) Signed-off-by: Peter Maydell --- target-i386/kvm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'target-i386/kvm.c') diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 27fe2be653..40d6a14c85 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -430,7 +430,7 @@ static void cpu_update_state(void *opaque, int running, RunState state) unsigned long kvm_arch_vcpu_id(CPUState *cs) { X86CPU *cpu = X86_CPU(cs); - return cpu->apic_id; + return cpu->env.cpuid_apic_id; } #ifndef KVM_CPUID_SIGNATURE_NEXT -- cgit v1.2.3