From patchwork Wed Sep 16 09:26:01 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avi Kivity X-Patchwork-Id: 47890 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 n8G9Quxf009707 for ; Wed, 16 Sep 2009 09:26:57 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932111AbZIPJ0u (ORCPT ); Wed, 16 Sep 2009 05:26:50 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932096AbZIPJ0t (ORCPT ); Wed, 16 Sep 2009 05:26:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:18333 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758338AbZIPJ0M (ORCPT ); Wed, 16 Sep 2009 05:26:12 -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 n8G9QFk1006113 for ; Wed, 16 Sep 2009 05:26:15 -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 n8G9QEgO015557; Wed, 16 Sep 2009 05:26:15 -0400 Received: from localhost.localdomain (cleopatra.tlv.redhat.com [10.35.255.11]) by cleopatra.tlv.redhat.com (Postfix) with ESMTP id E5736250ADE; Wed, 16 Sep 2009 12:26:11 +0300 (IDT) From: Avi Kivity To: Marcelo Tosatti Cc: kvm@vger.kernel.org Subject: [PATCH QEMU-KVM 26/34] test: Use xapic_write() to enable xapic() Date: Wed, 16 Sep 2009 12:26:01 +0300 Message-Id: <1253093169-1423-27-git-send-email-avi@redhat.com> In-Reply-To: <1253093169-1423-1-git-send-email-avi@redhat.com> References: <1253093169-1423-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 apic_write() depends on apic_ops, which is shared among cpus and can be modified if another cpu enabled x2apic. Use xapic_write() which is race-proof. Signed-off-by: Avi Kivity --- kvm/user/test/lib/x86/apic.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/kvm/user/test/lib/x86/apic.c b/kvm/user/test/lib/x86/apic.c index 16e51bc..1fc3888 100644 --- a/kvm/user/test/lib/x86/apic.c +++ b/kvm/user/test/lib/x86/apic.c @@ -139,7 +139,7 @@ void ioapic_write_redir(unsigned line, ioapic_redir_entry_t e) void enable_apic(void) { printf("enabling apic\n"); - apic_write(0xf0, 0x1ff); /* spurious vector register */ + xapic_write(0xf0, 0x1ff); /* spurious vector register */ } void mask_pic_interrupts(void)