From: Avi Kivity Subject: [PATCH QEMU-KVM 06/34] test: use real APIC instead of fake APIC Date: Wed, 16 Sep 2009 12:25:41 +0300 Message-ID: <1253093169-1423-7-git-send-email-avi@redhat.com> References: <1253093169-1423-1-git-send-email-avi@redhat.com> Cc: kvm@vger.kernel.org To: Marcelo Tosatti Return-path: Received: from mx1.redhat.com ([209.132.183.28]:10628 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752073AbZIPJ0J (ORCPT ); Wed, 16 Sep 2009 05:26:09 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8G9QDks017494 for ; Wed, 16 Sep 2009 05:26:13 -0400 In-Reply-To: <1253093169-1423-1-git-send-email-avi@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: smp temporarily disabled Signed-off-by: Avi Kivity --- kvm/user/test/x86/cstart64.S | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/kvm/user/test/x86/cstart64.S b/kvm/user/test/x86/cstart64.S index 3f193a3..912bcf8 100644 --- a/kvm/user/test/x86/cstart64.S +++ b/kvm/user/test/x86/cstart64.S @@ -1,5 +1,5 @@ -#include "fake-apic.h" +#include "apic.h" boot_idt = 0 @@ -131,8 +131,9 @@ start64: load_tss: mov $0, %eax mov %ax, %ss - mov $(APIC_BASE + APIC_REG_ID), %dx - in %dx, %eax + mov $(APIC_DEFAULT_PHYS_BASE + APIC_ID), %eax + mov (%rax), %eax + shr $24, %eax mov %eax, %ebx shl $4, %ebx mov $((tss_end - tss) / max_cpus), %edx @@ -150,6 +151,7 @@ load_tss: ret smp_init: +#if 0 lea boot_idt + ipi_vector * 8, %rdi mov $smp_init_ipi, %eax mov %ax, (%rdi) @@ -178,4 +180,5 @@ smp_loop: inc %esi jmp smp_loop smp_init_done: +#endif ret -- 1.6.4.1