From patchwork Fri Aug 5 20:55:27 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 1039132 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p75KuHXr008717 for ; Fri, 5 Aug 2011 20:56:17 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753958Ab1HEU4N (ORCPT ); Fri, 5 Aug 2011 16:56:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47562 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752171Ab1HEU4K (ORCPT ); Fri, 5 Aug 2011 16:56:10 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p75Ku6qA020158 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 5 Aug 2011 16:56:07 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p75Ku67D025462; Fri, 5 Aug 2011 16:56:06 -0400 Received: from amt.cnet (vpn1-7-153.ams2.redhat.com [10.36.7.153]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id p75Ku46C020578; Fri, 5 Aug 2011 16:56:05 -0400 Received: from amt.cnet (amt.cnet [127.0.0.1]) by amt.cnet (Postfix) with ESMTP id ABEF7656100; Fri, 5 Aug 2011 17:55:44 -0300 (BRT) Received: (from marcelo@localhost) by amt.cnet (8.14.5/8.14.5/Submit) id p75KtfT9023376; Fri, 5 Aug 2011 17:55:41 -0300 From: Marcelo Tosatti To: Anthony Liguori Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org, Jan Kiszka , Marcelo Tosatti Subject: [PATCH 2/6] kvm: Drop obsolete KVM_IOEVENTFD #ifdefs Date: Fri, 5 Aug 2011 17:55:27 -0300 Message-Id: <2a1ac12b0bb29054f5fbc8144c800ca7634c0658.1312577731.git.mtosatti@redhat.com> In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 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 (demeter1.kernel.org [140.211.167.41]); Fri, 05 Aug 2011 20:56:17 +0000 (UTC) From: Jan Kiszka Signed-off-by: Jan Kiszka Signed-off-by: Marcelo Tosatti --- kvm-all.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/kvm-all.c b/kvm-all.c index cbc2532..b9c172b 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -1328,7 +1328,6 @@ int kvm_set_signal_mask(CPUState *env, const sigset_t *sigset) int kvm_set_ioeventfd_mmio_long(int fd, uint32_t addr, uint32_t val, bool assign) { -#ifdef KVM_IOEVENTFD int ret; struct kvm_ioeventfd iofd; @@ -1353,14 +1352,10 @@ int kvm_set_ioeventfd_mmio_long(int fd, uint32_t addr, uint32_t val, bool assign } return 0; -#else - return -ENOSYS; -#endif } int kvm_set_ioeventfd_pio_word(int fd, uint16_t addr, uint16_t val, bool assign) { -#ifdef KVM_IOEVENTFD struct kvm_ioeventfd kick = { .datamatch = val, .addr = addr, @@ -1380,9 +1375,6 @@ int kvm_set_ioeventfd_pio_word(int fd, uint16_t addr, uint16_t val, bool assign) return r; } return 0; -#else - return -ENOSYS; -#endif } int kvm_on_sigbus_vcpu(CPUState *env, int code, void *addr)