From patchwork Sun Sep 13 15:18:51 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avi Kivity X-Patchwork-Id: 47164 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n8DFJDPv027216 for ; Sun, 13 Sep 2009 15:19:13 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754671AbZIMPTH (ORCPT ); Sun, 13 Sep 2009 11:19:07 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754452AbZIMPTH (ORCPT ); Sun, 13 Sep 2009 11:19:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55259 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754604AbZIMPSz (ORCPT ); Sun, 13 Sep 2009 11:18:55 -0400 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8DFIw5a005786 for ; Sun, 13 Sep 2009 11:18:59 -0400 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8DFIvE9026407; Sun, 13 Sep 2009 11:18:58 -0400 Received: from localhost.localdomain (cleopatra.tlv.redhat.com [10.35.255.11]) by cleopatra.tlv.redhat.com (Postfix) with ESMTP id DB2CC250053; Sun, 13 Sep 2009 18:18:55 +0300 (IDT) From: Avi Kivity To: Marcelo Tosatti Cc: kvm@vger.kernel.org Subject: [PATCH 06/10] test: use real APIC instead of fake APIC Date: Sun, 13 Sep 2009 18:18:51 +0300 Message-Id: <1252855135-2519-7-git-send-email-avi@redhat.com> In-Reply-To: <1252855135-2519-1-git-send-email-avi@redhat.com> References: <1252855135-2519-1-git-send-email-avi@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org 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