Skip to contentSkip to conversation

qemu-kvm: Cleanup compatfd makefile rule

PATCH In review Jan Kiszka 2 participants 6 messages Sep 18, 2009 – Sep 21, 2009

Subsystems (2)
KVM Kbuild
lore
Share & tools
lore

Jan Kiszka

author
#0 lore raw

PATCH 1/1 qemu-kvm: Cleanup compatfd makefile rule

Signed-off-by Jan Kiszka <[email protected]>

---

 Makefile |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)
Makefile +1 -6
index 6a9ca7c..6855fa2 100644
@@ -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
#1 lore raw
Quoted 11 lines · Jan Kiszka
Signed-off-by Jan Kiszka<[email protected]>

---

  Makefile |    7 +------
  1 files changed, 1 insertions(+), 6 deletions(-)
Makefile +0 -0
index 6a9ca7c..6855fa2 100644

Makefile recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES) · line 70

Quoted 8 lines
Makefile +1 -2
@@ -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.

Signature · 1 line
error compiling committee.c: too many arguments to function
author
#2 lore raw
Quoted 13 lines · Avi Kivity
Quoted 12 lines · Jan Kiszka
Signed-off-by Jan Kiszka<[email protected]>

---

  Makefile |    7 +------
  1 files changed, 1 insertions(+), 6 deletions(-)
Makefile +0 -0
index 6a9ca7c..6855fa2 100644
@@ -65,9 +65,8 @@ recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES)
Quoted 11 lines

Makefile recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES) · line 70

Quoted 7 lines
Makefile +1 -2
  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

Signature · 2 lines
Siemens AG, Corporate Technology, CT SE 2
Corporate Competence Center Embedded Linux
#3 lore raw
Quoted 28 lines · Jan Kiszka
Quoted 14 lines · Avi Kivity
Quoted 12 lines · Jan Kiszka
Signed-off-by Jan Kiszka<[email protected]>

---

   Makefile |    7 +------
   1 files changed, 1 insertions(+), 6 deletions(-)
Makefile +0 -0
index 6a9ca7c..6855fa2 100644
@@ -65,9 +65,8 @@ recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES)
Quoted 12 lines

Makefile recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES)

Quoted 8 lines
Makefile +1 -2
   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.

Quoted 4 lines

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.

Signature · 1 line
error compiling committee.c: too many arguments to function
author
#4 lore raw
Quoted 29 lines · Avi Kivity
Quoted 28 lines · Jan Kiszka
Quoted 26 lines · Avi Kivity
Quoted 11 lines · Jan Kiszka
Signed-off-by Jan Kiszka<[email protected]>

---

   Makefile |    7 +------
   1 files changed, 1 insertions(+), 6 deletions(-)
Makefile +0 -0
index 6a9ca7c..6855fa2 100644

Makefile recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES) · line 71

Quoted 9 lines
Makefile +1 -2
@@ -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.

Quoted 6 lines
Quoted 4 lines

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

Signature · 2 lines
Siemens AG, Corporate Technology, CT SE 2
Corporate Competence Center Embedded Linux
#5 lore raw
Quoted 6 lines · Jan Kiszka
Quoted 3 lines

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.

Signature · 1 line
error compiling committee.c: too many arguments to function