From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jan Kiszka <jan.kiszka@siemens.com>
Subject: Re: [PATCH] qemu-kvm: Cleanup compatfd makefile rule
Date: Mon, 21 Sep 2009 12:25:05 +0200
Message-ID: <4AB75481.9010603@siemens.com>
References: <4AB3C3EC.5030200@siemens.com> <4AB74783.406@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-15
Content-Transfer-Encoding: 7bit
Cc: Marcelo Tosatti <mtosatti@redhat.com>,
	kvm-devel <kvm@vger.kernel.org>
To: Avi Kivity <avi@redhat.com>
Return-path: <kvm-owner@vger.kernel.org>
Received: from thoth.sbs.de ([192.35.17.2]:19998 "EHLO thoth.sbs.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1755674AbZIUKZQ (ORCPT <rfc822;kvm@vger.kernel.org>);
	Mon, 21 Sep 2009 06:25:16 -0400
In-Reply-To: <4AB74783.406@redhat.com>
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>

Avi Kivity wrote:
> On 09/18/2009 08:31 PM, Jan Kiszka wrote:
>> Signed-off-by: Jan Kiszka<jan.kiszka@siemens.com>
>> ---
>>
>>   Makefile |    7 +------
>>   1 files changed, 1 insertions(+), 6 deletions(-)
>>
>> diff --git a/Makefile b/Makefile
>> index 6a9ca7c..6855fa2 100644
>> --- a/Makefile
>> +++ b/Makefile
>> @@ -65,9 +65,8 @@ recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES)
>>
>>   block-obj-y = cutils.o cache-utils.o qemu-malloc.o qemu-option.o module.o
>>   block-obj-y += nbd.o block.o aio.o aes.o osdep.o
>> -block-obj-$(CONFIG_POSIX) += posix-aio-compat.o
>> +block-obj-$(CONFIG_POSIX) += posix-aio-compat.o compatfd.o
>>   block-obj-$(CONFIG_LINUX_AIO) += linux-aio.o
>> -block-obj-y += compatfd.o
>>    
> 
> This looks to be already obsolete, but note that I prefer kvm-specific 
> changes to be on their own lines to reduce merge conflicts.  That is how 
> the code look now.

I don't mind if separate line or not, just use the proper CONFIG_POSIX
conditional.

Jan

-- 
Siemens AG, Corporate Technology, CT SE 2
Corporate Competence Center Embedded Linux