From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:59694)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gceq-qemu-devel@m.gmane.org>) id 1S1O5Y-0000rV-Jg
	for qemu-devel@nongnu.org; Sat, 25 Feb 2012 15:19:35 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gceq-qemu-devel@m.gmane.org>) id 1S1O5R-0003nW-JP
	for qemu-devel@nongnu.org; Sat, 25 Feb 2012 15:19:28 -0500
Received: from plane.gmane.org ([80.91.229.3]:59987)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gceq-qemu-devel@m.gmane.org>) id 1S1O5R-0003n9-Ce
	for qemu-devel@nongnu.org; Sat, 25 Feb 2012 15:19:21 -0500
Received: from list by plane.gmane.org with local (Exim 4.69)
	(envelope-from <gceq-qemu-devel@m.gmane.org>) id 1S1O5N-0003uK-0X
	for qemu-devel@nongnu.org; Sat, 25 Feb 2012 21:19:17 +0100
Received: from 93-34-182-16.ip50.fastwebnet.it ([93.34.182.16])
	by main.gmane.org with esmtp (Gmexim 0.1 (Debian))
	id 1AlnuQ-0007hv-00
	for <qemu-devel@nongnu.org>; Sat, 25 Feb 2012 21:19:16 +0100
Received: from pbonzini by 93-34-182-16.ip50.fastwebnet.it with local (Gmexim
	0.1 (Debian)) id 1AlnuQ-0007hv-00
	for <qemu-devel@nongnu.org>; Sat, 25 Feb 2012 21:19:16 +0100
From: Paolo Bonzini <pbonzini@redhat.com>
Date: Sat, 25 Feb 2012 21:19:05 +0100
Message-ID: <jibfnp$s95$1@dough.gmane.org>
References: <1330198969-27364-1-git-send-email-aliguori@us.ibm.com>
	<1330198969-27364-3-git-send-email-aliguori@us.ibm.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
In-Reply-To: <1330198969-27364-3-git-send-email-aliguori@us.ibm.com>
Subject: Re: [Qemu-devel] [PATCH 02/10] qtest: add support for -M pc
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

On 02/25/2012 08:42 PM, Anthony Liguori wrote:
> 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 <aliguori@us.ibm.com>
> ---
>  hw/pc_piix.c |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)
> 
> diff --git a/hw/pc_piix.c b/hw/pc_piix.c
> index 5e11d15..2c0881e 100644
> --- a/hw/pc_piix.c
> +++ b/hw/pc_piix.c
> @@ -46,6 +46,7 @@
>  #ifdef CONFIG_XEN
>  #  include <xen/hvm/hvm_info_table.h>
>  #endif
> +#include "qtest.h"
>  
>  #define MAX_IDE_BUS 2
>  
> @@ -212,6 +213,8 @@ static void pc_init1(MemoryRegion *system_memory,
>          i8259 = kvm_i8259_init(isa_bus);
>      } else 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]);

This is not needed anymore.

Paolo