* [PATCH] qemu-kvm: Cleanup compatfd makefile rule
@ 2009-09-18 17:31 Jan Kiszka
2009-09-21 9:29 ` Avi Kivity
0 siblings, 1 reply; 6+ messages in thread
From: Jan Kiszka @ 2009-09-18 17:31 UTC (permalink / raw)
To: Marcelo Tosatti; +Cc: kvm-devel
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
block-nested-y += cow.o qcow.o vdi.o vmdk.o cloop.o dmg.o bochs.o vpc.o vvfat.o
block-nested-y += qcow2.o qcow2-refcount.o qcow2-cluster.o qcow2-snapshot.o
@@ -78,10 +77,6 @@ block-nested-$(CONFIG_CURL) += curl.o
block-obj-y += $(addprefix block/, $(block-nested-y))
-ifdef CONFIG_AIO
-block-obj-y += compatfd.o
-endif
-
######################################################################
# libqemu_common.a: Target independent part of system emulation. The
# long term path is to suppress *all* target specific code in case of
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] qemu-kvm: Cleanup compatfd makefile rule
2009-09-18 17:31 [PATCH] qemu-kvm: Cleanup compatfd makefile rule Jan Kiszka
@ 2009-09-21 9:29 ` Avi Kivity
2009-09-21 10:25 ` Jan Kiszka
0 siblings, 1 reply; 6+ messages in thread
From: Avi Kivity @ 2009-09-21 9:29 UTC (permalink / raw)
To: Jan Kiszka; +Cc: Marcelo Tosatti, kvm-devel
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.
--
error compiling committee.c: too many arguments to function
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] qemu-kvm: Cleanup compatfd makefile rule
2009-09-21 9:29 ` Avi Kivity
@ 2009-09-21 10:25 ` Jan Kiszka
2009-09-21 11:49 ` Avi Kivity
0 siblings, 1 reply; 6+ messages in thread
From: Jan Kiszka @ 2009-09-21 10:25 UTC (permalink / raw)
To: Avi Kivity; +Cc: Marcelo Tosatti, kvm-devel
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] qemu-kvm: Cleanup compatfd makefile rule
2009-09-21 10:25 ` Jan Kiszka
@ 2009-09-21 11:49 ` Avi Kivity
2009-09-21 11:53 ` Jan Kiszka
0 siblings, 1 reply; 6+ messages in thread
From: Avi Kivity @ 2009-09-21 11:49 UTC (permalink / raw)
To: Jan Kiszka; +Cc: Marcelo Tosatti, kvm-devel
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@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.
>
>
I'm not sure it should be conditional, or part of block-obj-y.
--
error compiling committee.c: too many arguments to function
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] qemu-kvm: Cleanup compatfd makefile rule
2009-09-21 11:49 ` Avi Kivity
@ 2009-09-21 11:53 ` Jan Kiszka
2009-09-21 11:56 ` Avi Kivity
0 siblings, 1 reply; 6+ messages in thread
From: Jan Kiszka @ 2009-09-21 11:53 UTC (permalink / raw)
To: Avi Kivity; +Cc: Marcelo Tosatti, kvm-devel
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@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.
>>
>>
>
> 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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] qemu-kvm: Cleanup compatfd makefile rule
2009-09-21 11:53 ` Jan Kiszka
@ 2009-09-21 11:56 ` Avi Kivity
0 siblings, 0 replies; 6+ messages in thread
From: Avi Kivity @ 2009-09-21 11:56 UTC (permalink / raw)
To: Jan Kiszka; +Cc: Marcelo Tosatti, kvm-devel
On 09/21/2009 02:53 PM, Jan Kiszka wrote:
>
>> 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.
>
Oh, it's POSIX, not the old POSIX_AIO. I'll make the change.
--
error compiling committee.c: too many arguments to function
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-09-21 11:57 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-09-18 17:31 [PATCH] qemu-kvm: Cleanup compatfd makefile rule Jan Kiszka
2009-09-21 9:29 ` Avi Kivity
2009-09-21 10:25 ` Jan Kiszka
2009-09-21 11:49 ` Avi Kivity
2009-09-21 11:53 ` Jan Kiszka
2009-09-21 11:56 ` Avi Kivity
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.