From: Alex Williamson <alex.williamson@redhat.com>
To: avi@redhat.com, mst@redhat.com
Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
jan.kiszka@siemens.com
Subject: [PATCH v2 1/6] kvm: Pass kvm_irqfd to functions
Date: Tue, 26 Jun 2012 23:09:04 -0600 [thread overview]
Message-ID: <20120627050858.23698.44118.stgit@bling.home> (raw)
In-Reply-To: <20120627044758.23698.249.stgit@bling.home>
Prune this down to just the struct kvm_irqfd so we can avoid
changing function definition for every flag or field we use.
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
---
include/linux/kvm_host.h | 4 ++--
virt/kvm/eventfd.c | 20 ++++++++++----------
virt/kvm/kvm_main.c | 2 +-
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 27ac8a4..ae3b426 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -824,7 +824,7 @@ static inline void kvm_free_irq_routing(struct kvm *kvm) {}
#ifdef CONFIG_HAVE_KVM_EVENTFD
void kvm_eventfd_init(struct kvm *kvm);
-int kvm_irqfd(struct kvm *kvm, int fd, int gsi, int flags);
+int kvm_irqfd(struct kvm *kvm, struct kvm_irqfd *args);
void kvm_irqfd_release(struct kvm *kvm);
void kvm_irq_routing_update(struct kvm *, struct kvm_irq_routing_table *);
int kvm_ioeventfd(struct kvm *kvm, struct kvm_ioeventfd *args);
@@ -833,7 +833,7 @@ int kvm_ioeventfd(struct kvm *kvm, struct kvm_ioeventfd *args);
static inline void kvm_eventfd_init(struct kvm *kvm) {}
-static inline int kvm_irqfd(struct kvm *kvm, int fd, int gsi, int flags)
+static inline int kvm_irqfd(struct kvm *kvm, struct kvm_irqfd *args)
{
return -EINVAL;
}
diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c
index f59c1e8..c307c24 100644
--- a/virt/kvm/eventfd.c
+++ b/virt/kvm/eventfd.c
@@ -198,7 +198,7 @@ static void irqfd_update(struct kvm *kvm, struct _irqfd *irqfd,
}
static int
-kvm_irqfd_assign(struct kvm *kvm, int fd, int gsi)
+kvm_irqfd_assign(struct kvm *kvm, struct kvm_irqfd *args)
{
struct kvm_irq_routing_table *irq_rt;
struct _irqfd *irqfd, *tmp;
@@ -212,12 +212,12 @@ kvm_irqfd_assign(struct kvm *kvm, int fd, int gsi)
return -ENOMEM;
irqfd->kvm = kvm;
- irqfd->gsi = gsi;
+ irqfd->gsi = args->gsi;
INIT_LIST_HEAD(&irqfd->list);
INIT_WORK(&irqfd->inject, irqfd_inject);
INIT_WORK(&irqfd->shutdown, irqfd_shutdown);
- file = eventfd_fget(fd);
+ file = eventfd_fget(args->fd);
if (IS_ERR(file)) {
ret = PTR_ERR(file);
goto fail;
@@ -298,19 +298,19 @@ kvm_eventfd_init(struct kvm *kvm)
* shutdown any irqfd's that match fd+gsi
*/
static int
-kvm_irqfd_deassign(struct kvm *kvm, int fd, int gsi)
+kvm_irqfd_deassign(struct kvm *kvm, struct kvm_irqfd *args)
{
struct _irqfd *irqfd, *tmp;
struct eventfd_ctx *eventfd;
- eventfd = eventfd_ctx_fdget(fd);
+ eventfd = eventfd_ctx_fdget(args->fd);
if (IS_ERR(eventfd))
return PTR_ERR(eventfd);
spin_lock_irq(&kvm->irqfds.lock);
list_for_each_entry_safe(irqfd, tmp, &kvm->irqfds.items, list) {
- if (irqfd->eventfd == eventfd && irqfd->gsi == gsi) {
+ if (irqfd->eventfd == eventfd && irqfd->gsi == args->gsi) {
/*
* This rcu_assign_pointer is needed for when
* another thread calls kvm_irq_routing_update before
@@ -338,12 +338,12 @@ kvm_irqfd_deassign(struct kvm *kvm, int fd, int gsi)
}
int
-kvm_irqfd(struct kvm *kvm, int fd, int gsi, int flags)
+kvm_irqfd(struct kvm *kvm, struct kvm_irqfd *args)
{
- if (flags & KVM_IRQFD_FLAG_DEASSIGN)
- return kvm_irqfd_deassign(kvm, fd, gsi);
+ if (args->flags & KVM_IRQFD_FLAG_DEASSIGN)
+ return kvm_irqfd_deassign(kvm, args);
- return kvm_irqfd_assign(kvm, fd, gsi);
+ return kvm_irqfd_assign(kvm, args);
}
/*
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 02cb440..b4ad14cc 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -2059,7 +2059,7 @@ static long kvm_vm_ioctl(struct file *filp,
r = -EFAULT;
if (copy_from_user(&data, argp, sizeof data))
goto out;
- r = kvm_irqfd(kvm, data.fd, data.gsi, data.flags);
+ r = kvm_irqfd(kvm, &data);
break;
}
case KVM_IOEVENTFD: {
next prev parent reply other threads:[~2012-06-27 5:09 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-27 5:08 [PATCH v2 0/6] kvm: level triggered irqfd support Alex Williamson
2012-06-27 5:09 ` Alex Williamson [this message]
2012-06-27 9:35 ` [PATCH v2 1/6] kvm: Pass kvm_irqfd to functions Michael S. Tsirkin
2012-06-27 14:30 ` Alex Williamson
2012-06-27 14:24 ` Cornelia Huck
2012-06-28 8:38 ` Michael S. Tsirkin
2012-06-28 9:03 ` Cornelia Huck
2012-06-28 9:34 ` Michael S. Tsirkin
2012-06-28 12:00 ` Cornelia Huck
2012-06-28 12:09 ` Michael S. Tsirkin
2012-06-28 16:51 ` Cornelia Huck
2012-06-28 16:56 ` Michael S. Tsirkin
2012-06-29 15:14 ` Alex Williamson
2012-06-27 5:09 ` [PATCH v2 2/6] kvm: Add missing KVM_IRQFD API documentation Alex Williamson
2012-06-27 9:53 ` Michael S. Tsirkin
2012-06-27 5:09 ` [PATCH v2 3/6] kvm: Sanitize KVM_IRQFD flags Alex Williamson
2012-06-27 9:21 ` Michael S. Tsirkin
2012-06-27 20:12 ` Alex Williamson
2012-06-27 20:22 ` Michael S. Tsirkin
2012-06-28 12:35 ` Avi Kivity
2012-06-27 5:09 ` [PATCH v2 4/6] kvm: Extend irqfd to support level interrupts Alex Williamson
2012-06-27 9:34 ` Michael S. Tsirkin
2012-06-27 21:19 ` Alex Williamson
2012-06-28 12:41 ` Avi Kivity
2012-06-27 9:51 ` Michael S. Tsirkin
2012-06-27 20:59 ` Alex Williamson
2012-06-27 21:14 ` Michael S. Tsirkin
2012-06-27 21:28 ` Alex Williamson
2012-06-27 22:28 ` Michael S. Tsirkin
2012-06-28 3:52 ` Alex Williamson
2012-06-28 8:29 ` Michael S. Tsirkin
2012-06-29 15:13 ` Alex Williamson
2012-06-27 15:26 ` Michael S. Tsirkin
2012-06-27 22:04 ` Alex Williamson
2012-06-27 22:31 ` Michael S. Tsirkin
2012-06-28 6:34 ` Gleb Natapov
2012-06-28 8:34 ` Michael S. Tsirkin
2012-06-28 8:35 ` Gleb Natapov
2012-06-28 8:41 ` Michael S. Tsirkin
2012-06-28 8:46 ` Gleb Natapov
2012-06-28 8:48 ` Michael S. Tsirkin
2012-06-28 8:53 ` Gleb Natapov
2012-06-29 22:27 ` Alex Williamson
2012-07-01 7:34 ` Gleb Natapov
2012-06-27 5:10 ` [PATCH v2 5/6] kvm: KVM_EOIFD, an eventfd for EOIs Alex Williamson
2012-06-27 9:49 ` Michael S. Tsirkin
2012-06-27 13:58 ` Gleb Natapov
2012-06-27 14:29 ` Alex Williamson
2012-06-27 14:51 ` Gleb Natapov
2012-06-28 3:55 ` Alex Williamson
2012-06-28 13:11 ` Michael S. Tsirkin
2012-06-28 14:08 ` Gleb Natapov
2012-06-28 16:55 ` Michael S. Tsirkin
2012-06-27 15:20 ` Michael S. Tsirkin
2012-06-28 19:29 ` Michael S. Tsirkin
2012-06-29 15:09 ` Alex Williamson
2012-06-29 15:12 ` Alex Williamson
2012-06-27 5:10 ` [PATCH v2 6/6] kvm: Level IRQ de-assert for KVM_IRQFD Alex Williamson
2012-06-28 12:59 ` Avi Kivity
2012-06-29 15:39 ` Alex Williamson
2012-06-27 9:15 ` [PATCH v2 0/6] kvm: level triggered irqfd support Michael S. Tsirkin
2012-06-27 9:58 ` Michael S. Tsirkin
2012-06-27 14:33 ` Alex Williamson
2012-06-28 8:42 ` Michael S. Tsirkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120627050858.23698.44118.stgit@bling.home \
--to=alex.williamson@redhat.com \
--cc=avi@redhat.com \
--cc=jan.kiszka@siemens.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).