Avi Kivity wrote: > On 09/21/2009 01:25 PM, Jan Kiszka wrote: >> Avi Kivity wrote: >> >>> On 09/18/2009 08:31 PM, Jan Kiszka wrote: >>> >>>> Signed-off-by: Jan Kiszka<jan.kiszka@xxxxxxxxxxx> >>>> --- >>>> >>>> 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. >> >> > > I'm not sure it should be conditional, or part of block-obj-y. I am: compatfd requires POSIX, but the block layer is also built on non-POSIX hosts. Jan -- Siemens AG, Corporate Technology, CT SE 2 Corporate Competence Center Embedded Linux -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
