From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:54766)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1SCDre-0000cK-Tz
	for qemu-devel@nongnu.org; Mon, 26 Mar 2012 13:37:59 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1SCDrc-0004vU-8H
	for qemu-devel@nongnu.org; Mon, 26 Mar 2012 13:37:54 -0400
Received: from mail-qa0-f52.google.com ([209.85.216.52]:61956)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1SCDrc-0004uy-4V
	for qemu-devel@nongnu.org; Mon, 26 Mar 2012 13:37:52 -0400
Received: by qabg40 with SMTP id g40so2232984qab.4
	for <qemu-devel@nongnu.org>; Mon, 26 Mar 2012 10:37:50 -0700 (PDT)
Message-ID: <4F70A96B.30101@codemonkey.ws>
Date: Mon, 26 Mar 2012 12:37:47 -0500
From: Anthony Liguori <anthony@codemonkey.ws>
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> <4F70655B.3090107@siemens.com>
In-Reply-To: <4F70655B.3090107@siemens.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
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: Jan Kiszka <jan.kiszka@siemens.com>
Cc: Wanpeng Li <liwp@linux.vnet.ibm.com>, Anthony Liguori <aliguori@us.ibm.com>, qemu-devel@nongnu.org, Avi Kivity <avi@redhat.com>, Gavin Shan <shangw@linux.vnet.ibm.com>

On 03/26/2012 07:47 AM, Jan Kiszka wrote:
> 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...

git should have thrown a rebase error here.  I think that means the conflicts 
were ignored.

For something like this, if there's a rebase error, you pretty much have to 
repeat the copy/paste of the code for the section that threw a rebase error.

I'd suggest rebasing again but this time, be a bit more careful when resolving 
conflicts.

Regards,

Anthony Liguori

>
> Jan
>