From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:47823)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <avi@redhat.com>) id 1SC9GK-00052N-Qy
	for qemu-devel@nongnu.org; Mon, 26 Mar 2012 08:43:06 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <avi@redhat.com>) id 1SC9GG-0007o2-0M
	for qemu-devel@nongnu.org; Mon, 26 Mar 2012 08:43:04 -0400
Received: from mx1.redhat.com ([209.132.183.28]:37606)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <avi@redhat.com>) id 1SC9GF-0007iY-Mr
	for qemu-devel@nongnu.org; Mon, 26 Mar 2012 08:42:59 -0400
Message-ID: <4F70644D.1070603@redhat.com>
Date: Mon, 26 Mar 2012 14:42:53 +0200
From: Avi Kivity <avi@redhat.com>
MIME-Version: 1.0
References: <1332727608-26523-1-git-send-email-liwp@linux.vnet.ibm.com>
	<1332727608-26523-6-git-send-email-liwp@linux.vnet.ibm.com>
In-Reply-To: <1332727608-26523-6-git-send-email-liwp@linux.vnet.ibm.com>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH 5/6] merge pc_piix.c to pc.c
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: 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>

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