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: 93933 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o3LJGHMT007759 for ; Wed, 21 Apr 2010 19:16:17 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755021Ab0DUTPx (ORCPT ); Wed, 21 Apr 2010 15:15:53 -0400 Received: from fleet.cs.ualberta.ca ([129.128.22.22]:35773 "EHLO fleet.cs.ualberta.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753717Ab0DUTPv (ORCPT ); Wed, 21 Apr 2010 15:15:51 -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 Cc: qemu-devel@nongnu.org, Cam Macdonell Subject: [PATCH v5 3/5] RESEND: function for assigning ioeventfds. 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> 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.3 (demeter.kernel.org [140.211.167.41]); Wed, 21 Apr 2010 19:16:17 +0000 (UTC) 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;