From: Jike Song <jike.song@intel.com>
To: pbonzini@redhat.com, alex.williamson@redhat.com,
guangrong.xiao@linux.intel.com
Cc: kwankhede@nvidia.com, cjia@nvidia.com, kevin.tian@intel.com,
jike.song@intel.com, kvm@vger.kernel.org
Subject: [v3 1/5] vfio: Rearrange functions to get vfio_group from dev
Date: Mon, 31 Oct 2016 14:35:02 +0800 [thread overview]
Message-ID: <1477895706-22824-2-git-send-email-jike.song@intel.com> (raw)
In-Reply-To: <1477895706-22824-1-git-send-email-jike.song@intel.com>
From: Kirti Wankhede <kwankhede@nvidia.com>
This patch rearranges functions to get vfio_group from device
Signed-off-by: Kirti Wankhede <kwankhede@nvidia.com>
Signed-off-by: Neo Jia <cjia@nvidia.com>
Change-Id: I1f93262bdbab75094bc24b087b29da35ba70c4c6
---
drivers/vfio/vfio.c | 23 ++++++++++++++++-------
1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
index d1d70e0..23bc86c 100644
--- a/drivers/vfio/vfio.c
+++ b/drivers/vfio/vfio.c
@@ -480,6 +480,21 @@ static struct vfio_group *vfio_group_get_from_minor(int minor)
return group;
}
+static struct vfio_group *vfio_group_get_from_dev(struct device *dev)
+{
+ struct iommu_group *iommu_group;
+ struct vfio_group *group;
+
+ iommu_group = iommu_group_get(dev);
+ if (!iommu_group)
+ return NULL;
+
+ group = vfio_group_get_from_iommu(iommu_group);
+ iommu_group_put(iommu_group);
+
+ return group;
+}
+
/**
* Device objects - create, release, get, put, search
*/
@@ -811,16 +826,10 @@ int vfio_add_group_dev(struct device *dev,
*/
struct vfio_device *vfio_device_get_from_dev(struct device *dev)
{
- struct iommu_group *iommu_group;
struct vfio_group *group;
struct vfio_device *device;
- iommu_group = iommu_group_get(dev);
- if (!iommu_group)
- return NULL;
-
- group = vfio_group_get_from_iommu(iommu_group);
- iommu_group_put(iommu_group);
+ group = vfio_group_get_from_dev(dev);
if (!group)
return NULL;
--
1.9.1
next prev parent reply other threads:[~2016-10-31 6:40 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-31 6:35 [v3 0/5] plumb kvm/vfio to allow getting kvm from vfio_group Jike Song
2016-10-31 6:35 ` Jike Song [this message]
2016-10-31 6:35 ` [v3 2/5] vfio: export functions to get vfio_group from device and put it Jike Song
2016-10-31 6:35 ` [v3 3/5] KVM: move kvm_get_kvm to kvm_host.h Jike Song
2016-10-31 8:33 ` Paolo Bonzini
2016-10-31 6:35 ` [v3 4/5] vfio: implement APIs to set/put kvm to/from vfio group Jike Song
2016-11-07 18:04 ` Alex Williamson
2016-11-07 18:10 ` Paolo Bonzini
2016-11-07 18:28 ` Alex Williamson
2016-11-07 20:45 ` Paolo Bonzini
2016-11-09 12:49 ` Jike Song
2016-11-09 13:06 ` Xiao Guangrong
2016-11-09 13:31 ` Paolo Bonzini
2016-11-09 14:00 ` Xiao Guangrong
2016-11-09 14:28 ` Paolo Bonzini
2016-11-10 4:13 ` Jike Song
2016-11-09 17:53 ` Alex Williamson
2016-11-10 4:10 ` Jike Song
2016-11-10 6:04 ` Jike Song
2016-11-10 15:37 ` Alex Williamson
2016-11-11 7:29 ` Jike Song
2016-11-14 10:19 ` Jike Song
2016-11-14 15:52 ` Alex Williamson
2016-11-09 2:28 ` Jike Song
2016-11-09 2:52 ` Xiao Guangrong
2016-11-09 3:07 ` Jike Song
2016-10-31 6:35 ` [v3 5/5] KVM: set/clear kvm to/from vfio group during add/delete Jike Song
2016-10-31 8:33 ` Paolo Bonzini
2016-10-31 7:06 ` [v3 0/5] plumb kvm/vfio to allow getting kvm from vfio_group Xiao Guangrong
2016-10-31 7:24 ` Jike Song
2016-10-31 7:24 ` Xiao Guangrong
2016-10-31 7:30 ` Jike Song
2016-10-31 7:35 ` Xiao Guangrong
2016-11-02 1:06 ` Jike Song
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=1477895706-22824-2-git-send-email-jike.song@intel.com \
--to=jike.song@intel.com \
--cc=alex.williamson@redhat.com \
--cc=cjia@nvidia.com \
--cc=guangrong.xiao@linux.intel.com \
--cc=kevin.tian@intel.com \
--cc=kvm@vger.kernel.org \
--cc=kwankhede@nvidia.com \
--cc=pbonzini@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).