Re: [Qemu-devel] [PATCH 5/6] merge pc_piix.c to pc.c

From: Avi Kivity <avi@redhat.com>
To: Wanpeng Li <liwp@linux.vnet.ibm.com>
Cc: Anthony Liguori <aliguori@us.ibm.com>,
	qemu-devel@nongnu.org, Gavin Shan <shangw@linux.vnet.ibm.com>
Subject: Re: [Qemu-devel] [PATCH 5/6] merge pc_piix.c to pc.c
Date: Mon, 26 Mar 2012 14:42:53 +0200	[thread overview]
Message-ID: <4F70644D.1070603@redhat.com> (raw)
In-Reply-To: <1332727608-26523-6-git-send-email-liwp@linux.vnet.ibm.com>

On 03/26/2012 04:06 AM, Wanpeng Li wrote:
> From: Anthony Liguori <aliguori@us.ibm.com>
>
> @@ -889,7 +900,7 @@ static DeviceState *apic_init(void *env, uint8_t apic_id)
>      DeviceState *dev;
>      static int apic_mapped;
>  
> -    if (kvm_irqchip_in_kernel()) {
> +    if (kvm_enabled() && kvm_irqchip_in_kernel()) {
>          dev = qdev_create(NULL, "kvm-apic");
>      } else {
>          dev = qdev_create(NULL, "apic");
> @@ -908,7 +919,7 @@ static DeviceState *apic_init(void *env, uint8_t apic_id)
>      }
>  
>      /* KVM does not support MSI yet. */
> -    if (!kvm_irqchip_in_kernel()) {
> +    if (!kvm_enabled() || !kvm_irqchip_in_kernel()) {
>          msi_supported = true;

Why these changes?

-- 
error compiling committee.c: too many arguments to function