From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:49336) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rllvv-000421-NF for qemu-devel@nongnu.org; Fri, 13 Jan 2012 13:33:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rllvu-0008Rg-Id for qemu-devel@nongnu.org; Fri, 13 Jan 2012 13:32:59 -0500 Received: from e4.ny.us.ibm.com ([32.97.182.144]:42680) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rllvu-0008RY-G7 for qemu-devel@nongnu.org; Fri, 13 Jan 2012 13:32:58 -0500 Received: from /spool/local by e4.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 13 Jan 2012 13:32:56 -0500 Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay03.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q0DIWeAm265740 for ; Fri, 13 Jan 2012 13:32:40 -0500 Received: from d01av04.pok.ibm.com (loopback [127.0.0.1]) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q0DIWe4F024521 for ; Fri, 13 Jan 2012 13:32:40 -0500 From: Anthony Liguori Date: Fri, 13 Jan 2012 12:32:34 -0600 Message-Id: <1326479558-3016-2-git-send-email-aliguori@us.ibm.com> In-Reply-To: <1326479558-3016-1-git-send-email-aliguori@us.ibm.com> References: <1326479558-3016-1-git-send-email-aliguori@us.ibm.com> Subject: [Qemu-devel] [PATCH 2/6] qtest: add support for -M pc List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Paolo Bonzini , Anthony Liguori , Stefan Hajnoczi This involves replacing the local APIC with the qtest interrupt controller. It should be pretty straight forward to do the same for other machine types. Signed-off-by: Anthony Liguori --- hw/pc_piix.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/hw/pc_piix.c b/hw/pc_piix.c index b70431f..2aba89c 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -46,6 +46,7 @@ #ifdef CONFIG_XEN # include #endif +#include "qtest.h" #define MAX_IDE_BUS 2 @@ -154,11 +155,13 @@ static void pc_init1(MemoryRegion *system_memory, } isa_bus_irqs(isa_bus, gsi); - if (!xen_enabled()) { + if (xen_enabled()) { + i8259 = xen_interrupt_controller_init(); + } else if (qtest_enabled()) { + i8259 = qtest_interrupt_controller_init(); + } else { cpu_irq = pc_allocate_cpu_irq(); i8259 = i8259_init(isa_bus, cpu_irq[0]); - } else { - i8259 = xen_interrupt_controller_init(); } for (i = 0; i < ISA_NUM_IRQS; i++) { -- 1.7.4.1