From patchwork Wed Apr 21 19:15:47 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cam Macdonell X-Patchwork-Id: 50672 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1D089B7C33 for ; Thu, 22 Apr 2010 05:16:41 +1000 (EST) Received: from localhost ([127.0.0.1]:58989 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O4fPZ-0007aZ-Tv for incoming@patchwork.ozlabs.org; Wed, 21 Apr 2010 15:16:37 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O4fOt-0007YR-RQ for qemu-devel@nongnu.org; Wed, 21 Apr 2010 15:15:55 -0400 Received: from [140.186.70.92] (port=33005 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O4fOs-0007Ww-JZ for qemu-devel@nongnu.org; Wed, 21 Apr 2010 15:15:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O4fOq-0007uH-RF for qemu-devel@nongnu.org; Wed, 21 Apr 2010 15:15:54 -0400 Received: from fleet.cs.ualberta.ca ([129.128.22.22]:35775) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O4fOq-0007tw-4z for qemu-devel@nongnu.org; Wed, 21 Apr 2010 15:15:52 -0400 Received: from localhost.localdomain (st-brides.cs.ualberta.ca [129.128.23.21]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp-auth.cs.ualberta.ca (Postfix) with ESMTP id 3154D2800D; Wed, 21 Apr 2010 13:15:51 -0600 (MDT) From: Cam Macdonell To: kvm@vger.kernel.org Date: Wed, 21 Apr 2010 13:15:47 -0600 Message-Id: <1271877347-24981-1-git-send-email-cam@cs.ualberta.ca> X-Mailer: git-send-email 1.6.2.5 In-Reply-To: <1271872163-22722-4-git-send-email-cam@cs.ualberta.ca> References: <1271872163-22722-4-git-send-email-cam@cs.ualberta.ca> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: Cam Macdonell , qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH v5 3/5] RESEND: function for assigning ioeventfds. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Apologies, I wasn't on the latest KVM HEAD and so missed that Michael had added an irqfd assignment function (and a more correct one at that). So now this patch has just one function. --- kvm-all.c | 26 ++++++++++++++++++++++++++ kvm.h | 7 +++++++ 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/kvm-all.c b/kvm-all.c index c0d27db..df8e398 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -1193,6 +1193,32 @@ int kvm_set_signal_mask(CPUState *env, const sigset_t *sigset) } #ifdef KVM_IOEVENTFD +int kvm_set_ioeventfd_mmio_long(int fd, uint32_t addr, uint32_t val, bool assign) +{ + + int ret; + struct kvm_ioeventfd iofd; + + iofd.datamatch = val; + iofd.addr = addr; + iofd.len = 4; + iofd.flags = KVM_IOEVENTFD_FLAG_DATAMATCH; + iofd.fd = fd; + + if (!kvm_enabled()) + return -ENOSYS; + if (!assign) + iofd.flags |= KVM_IOEVENTFD_FLAG_DEASSIGN; + + ret = kvm_vm_ioctl(kvm_state, KVM_IOEVENTFD, &iofd); + + if (ret < 0) { + return ret; + } + + return 0; +} + int kvm_set_ioeventfd_pio_word(int fd, uint16_t addr, uint16_t val, bool assign) { struct kvm_ioeventfd kick = { diff --git a/kvm.h b/kvm.h index 65a4ee2..0f25d20 100644 --- a/kvm.h +++ b/kvm.h @@ -174,9 +174,16 @@ static inline void cpu_synchronize_post_init(CPUState *env) } #if defined(KVM_IOEVENTFD) && defined(CONFIG_KVM) +int kvm_set_ioeventfd_mmio_long(int fd, uint32_t adr, uint32_t val, bool assign); int kvm_set_ioeventfd_pio_word(int fd, uint16_t adr, uint16_t val, bool assign); #else static inline +int kvm_set_ioeventfd_mmio_long(int fd, uint16_t adr, uint16_t val, bool assign) +{ + return -ENOSYS; +} + +static inline int kvm_set_ioeventfd_pio_word(int fd, uint16_t adr, uint16_t val, bool assign) { return -ENOSYS;