[07/24] One CONFIG_EVENTFD should be enough

Commit Message

Juan Quintela Sept. 18, 2009, 11:41 a.m. UTC

(there was a missmerge with need_offset)

Signed-off-by: Juan Quintela <[e-mail]>
---
 compatfd.c |    2 +-
 configure  |    4 ----
 qemu-kvm.c |    2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

Patch

diff --git a/compatfd.c b/compatfd.c
index 8c78597..594e4af 100644
--- a/compatfd.c
+++ b/compatfd.c
@@ -113,7 +113,7 @@  int qemu_signalfd(const sigset_t *mask)

 int qemu_eventfd(int *fds)
 {
-#if defined(CONFIG_eventfd)
+#if defined(CONFIG_EVENTFD)
     int ret;

     ret = syscall(SYS_eventfd, 0);
diff --git a/configure b/configure
index 298a60b..bbb0c9d 100755
--- a/configure
+++ b/configure
@@ -234,7 +234,6 @@  kerneldir=""
 aix="no"
 blobs="yes"
 pkgversion=" ($(kvm_version))"
-eventfd="no"
 cpu_emulation="yes"
 kvm_kmod="no"
 pkgversion=""
@@ -2053,12 +2052,9 @@  fi
 if test "$signalfd" = "yes" ; then
   echo "CONFIG_SIGNALFD=y" >> $config_host_mak
 fi
-if test "$eventfd" = "yes" ; then
-  echo "CONFIG_eventfd=y" >> $config_host_mak
 if test "$need_offsetof" = "yes" ; then
   echo "CONFIG_NEED_OFFSETOF=y" >> $config_host_mak
 fi
-fi

 # XXX: suppress that
 if [ "$bsd" = "yes" ] ; then
diff --git a/qemu-kvm.c b/qemu-kvm.c
index bff11e8..aaaafd7 100644
--- a/qemu-kvm.c
+++ b/qemu-kvm.c
@@ -1448,7 +1448,7 @@  int kvm_assign_set_msix_entry(kvm_context_t kvm,
 }
 #endif

-#if defined(KVM_CAP_IRQFD) && defined(CONFIG_eventfd)
+#if defined(KVM_CAP_IRQFD) && defined(CONFIG_EVENTFD)

 #include <sys/eventfd.h>