From patchwork Fri Sep 18 11:41:17 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 48500 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n8IBfwfw013831 for ; Fri, 18 Sep 2009 11:41:58 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756639AbZIRLlv (ORCPT ); Fri, 18 Sep 2009 07:41:51 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756634AbZIRLlv (ORCPT ); Fri, 18 Sep 2009 07:41:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:6503 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756623AbZIRLlt (ORCPT ); Fri, 18 Sep 2009 07:41:49 -0400 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8IBfrpC000866 for ; Fri, 18 Sep 2009 07:41:53 -0400 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8IBfa8p017440; Fri, 18 Sep 2009 07:41:48 -0400 From: Juan Quintela To: kvm@vger.kernel.org Subject: [PATCH 07/24] One CONFIG_EVENTFD should be enough Date: Fri, 18 Sep 2009 13:41:17 +0200 Message-Id: <667455fc8bbbc14b52d531182288c505d98d468c.1253272938.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org (there was a missmerge with need_offset) Signed-off-by: Juan Quintela --- compatfd.c | 2 +- configure | 4 ---- qemu-kvm.c | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) 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