# HG changeset patch # User Christian Ehrhardt <ehrhardt@xxxxxxxxxxxxxxxxxx> # Date 1229345133 -3600 # Node ID b48b9d560f80037ab4e12eae128022622c7ccb34 # Parent 4b0ad05490115e4c6f31d2419c0e5b628040f90b [PATCH] kvm-userspace: ppc: fix compatfd build decision v2 From: Christian Ehrhardt <ehrhardt@xxxxxxxxxxxxxxxxxx> qemu-kvm.c uses qemu_eventfd/qemu_signalfd. The code of compatfd takes care if CONFIG_eventfd/CONFIG_signalfd is really enabled. But currently compatfd is not build if --disable-aio is set which leads to undefined references when linking. Since compatfd.c takes care of configs being set we can savely build it in all cases dropping the ifdef completely. This allows powerpc but also all other archs to build in case --disable-aio is set. Signed-off-by: Christian Ehrhardt <ehrhardt@xxxxxxxxxxxxxxxxxx> --- [diffstat] Makefile | 5 +---- Makefile.target | 6 +----- 2 files changed, 2 insertions(+), 9 deletions(-) [diff] diff --git a/qemu/Makefile b/qemu/Makefile --- a/qemu/Makefile +++ b/qemu/Makefile @@ -51,7 +51,7 @@ BLOCK_OBJS+=block-cow.o block-qcow.o aes BLOCK_OBJS+=block-cow.o block-qcow.o aes.o block-vmdk.o block-cloop.o BLOCK_OBJS+=block-dmg.o block-bochs.o block-vpc.o block-vvfat.o BLOCK_OBJS+=block-qcow2.o block-parallels.o block-nbd.o -BLOCK_OBJS+=nbd.o block.o aio.o +BLOCK_OBJS+=nbd.o block.o aio.o compatfd.o ifdef CONFIG_WIN32 BLOCK_OBJS += block-raw-win32.o @@ -59,9 +59,6 @@ BLOCK_OBJS += block-raw-posix.o BLOCK_OBJS += block-raw-posix.o endif -ifdef CONFIG_AIO -BLOCK_OBJS += compatfd.o -endif ###################################################################### # libqemu_common.a: Target independent part of system emulation. The diff --git a/qemu/Makefile.target b/qemu/Makefile.target --- a/qemu/Makefile.target +++ b/qemu/Makefile.target @@ -646,6 +646,7 @@ OBJS=vl.o osdep.o monitor.o pci.o loader OBJS=vl.o osdep.o monitor.o pci.o loader.o isa_mmio.o machine.o OBJS+=fw_cfg.o OBJS+=net.o +OBJS+=compatfd.o ifdef CONFIG_KVM OBJS+=kvm.o kvm-all.o endif @@ -654,11 +655,6 @@ else else OBJS+=block-raw-posix.o endif - -ifdef CONFIG_AIO -OBJS+=compatfd.o -endif - LIBS+=-lz ifdef CONFIG_ALSA LIBS += -lasound -- To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
