From patchwork Wed Jun 1 08:54:23 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 837442 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p518sme0000360 for ; Wed, 1 Jun 2011 08:54:48 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1162292Ab1FAIyi (ORCPT ); Wed, 1 Jun 2011 04:54:38 -0400 Received: from david.siemens.de ([192.35.17.14]:32708 "EHLO david.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1162264Ab1FAIyf (ORCPT ); Wed, 1 Jun 2011 04:54:35 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by david.siemens.de (8.13.6/8.13.6) with ESMTP id p518sOd3018967; Wed, 1 Jun 2011 10:54:24 +0200 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p518sNHP022117; Wed, 1 Jun 2011 10:54:23 +0200 Message-ID: <4DE5FE3F.6090601@siemens.com> Date: Wed, 01 Jun 2011 10:54:23 +0200 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: Avi Kivity , Marcelo Tosatti CC: kvm Subject: [PATCH] Revert "qemu-kvm: Update kvm_check_many_ioeventfds for qemu-kvm use" Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Wed, 01 Jun 2011 08:54:48 +0000 (UTC) This reverts commit cad7c5d76b30d30fc91dea049fef7340fd96ff3c. We migrated to upstream io-thread, so this hack became obsolete. Signed-off-by: Jan Kiszka --- kvm-all.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/kvm-all.c b/kvm-all.c index f3958e8..cc2c73d 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -488,7 +488,7 @@ static int kvm_check_many_ioeventfds(void) * Older kernels have a 6 device limit on the KVM io bus. Find out so we * can avoid creating too many ioeventfds. */ -#if defined(CONFIG_EVENTFD) /* && defined(CONFIG_IOTHREAD) */ +#if defined(CONFIG_EVENTFD) && defined(CONFIG_IOTHREAD) int ioeventfds[7]; int i, ret = 0; for (i = 0; i < ARRAY_SIZE(ioeventfds); i++) {