From mboxrd@z Thu Jan 1 00:00:00 1970 From: Avi Kivity Subject: Re: [PATCH] qemu-kvm: Cleanup compatfd makefile rule Date: Mon, 21 Sep 2009 12:29:39 +0300 Message-ID: <4AB74783.406@redhat.com> References: <4AB3C3EC.5030200@siemens.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit Cc: Marcelo Tosatti , kvm-devel To: Jan Kiszka Return-path: Received: from mx1.redhat.com ([209.132.183.28]:11393 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755684AbZIUJ3j (ORCPT ); Mon, 21 Sep 2009 05:29:39 -0400 In-Reply-To: <4AB3C3EC.5030200@siemens.com> Sender: kvm-owner@vger.kernel.org List-ID: On 09/18/2009 08:31 PM, Jan Kiszka wrote: > Signed-off-by: Jan Kiszka > --- > > 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. -- error compiling committee.c: too many arguments to function