From: Avi Kivity Subject: [PATCH 1/2] test: Mask PIC interrupts before APIC test Date: Mon, 14 Sep 2009 14:50:21 +0300 Message-ID: <1252929022-13927-2-git-send-email-avi@redhat.com> References: <1252929022-13927-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]:38495 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755389AbZINLuV (ORCPT ); Mon, 14 Sep 2009 07:50:21 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8EBoPaG007930 for ; Mon, 14 Sep 2009 07:50:25 -0400 In-Reply-To: <1252929022-13927-1-git-send-email-avi@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: We aren't ready to handle PIC interrupts, so mask them. Signed-off-by: Avi Kivity --- kvm/user/test/x86/apic.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/kvm/user/test/x86/apic.c b/kvm/user/test/x86/apic.c index 7794615..b712ef8 100644 --- a/kvm/user/test/x86/apic.c +++ b/kvm/user/test/x86/apic.c @@ -102,6 +102,11 @@ static idt_entry_t idt[256]; static int g_fail; static int g_tests; +static void outb(unsigned char data, unsigned short port) +{ + asm volatile ("out %0, %1" : : "a"(data), "d"(port)); +} + static void report(const char *msg, int pass) { ++g_tests; @@ -325,9 +330,16 @@ static void test_ioapic_simultaneous(void) static void enable_apic(void) { + printf("enabling apic\n"); apic_write(0xf0, 0x1ff); /* spurious vector register */ } +static void mask_pic_interrupts(void) +{ + outb(0xff, 0x21); + outb(0xff, 0xa1); +} + int main() { setup_vm(); @@ -337,6 +349,7 @@ int main() test_lapic_existence(); + mask_pic_interrupts(); enable_apic(); init_idt(); -- 1.6.4.1