From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:59110)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jan.kiszka@siemens.com>) id 1SC9Kp-0000v2-0H
	for qemu-devel@nongnu.org; Mon, 26 Mar 2012 08:47:50 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jan.kiszka@siemens.com>) id 1SC9Ki-0000su-OH
	for qemu-devel@nongnu.org; Mon, 26 Mar 2012 08:47:42 -0400
Received: from david.siemens.de ([192.35.17.14]:20077)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jan.kiszka@siemens.com>) id 1SC9Ki-0000sH-Ec
	for qemu-devel@nongnu.org; Mon, 26 Mar 2012 08:47:36 -0400
Message-ID: <4F70655B.3090107@siemens.com>
Date: Mon, 26 Mar 2012 14:47:23 +0200
From: Jan Kiszka <jan.kiszka@siemens.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>
	<4F70644D.1070603@redhat.com>
In-Reply-To: <4F70644D.1070603@redhat.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: Avi Kivity <avi@redhat.com>
Cc: Gavin Shan <shangw@linux.vnet.ibm.com>, Anthony Liguori <aliguori@us.ibm.com>, Wanpeng Li <liwp@linux.vnet.ibm.com>, qemu-devel@nongnu.org

On 2012-03-26 14:42, Avi Kivity wrote:
> 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?
> 

Yep, they are obsolete, likely related to the rebase of the original
patch. A lot of code is moved around here, and I bet there are more
artifacts...

Jan

-- 
Siemens AG, Corporate Technology, CT T DE IT 1
Corporate Competence Center Embedded Linux