From: andre.przywara@arm.com (Andre Przywara)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v7 10/15] add kvm__check_vm_capability
Date: Wed, 20 Jul 2016 18:04:30 +0100 [thread overview]
Message-ID: <20160720170435.28090-11-andre.przywara@arm.com> (raw)
In-Reply-To: <20160720170435.28090-1-andre.przywara@arm.com>
KVM capabilities can be per-VM, in this case the ioctl should be
issued on the VM file descriptor, not on the system fd.
Since this feature is guarded by a (system) capability itself, wrap
the call into a function of its own.
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
---
include/kvm/kvm.h | 1 +
kvm.c | 28 ++++++++++++++++++++++++++++
2 files changed, 29 insertions(+)
diff --git a/include/kvm/kvm.h b/include/kvm/kvm.h
index 4a76ec2..a76a25d 100644
--- a/include/kvm/kvm.h
+++ b/include/kvm/kvm.h
@@ -129,6 +129,7 @@ static inline bool host_ptr_in_ram(struct kvm *kvm, void *p)
}
bool kvm__supports_extension(struct kvm *kvm, unsigned int extension);
+bool kvm__supports_vm_extension(struct kvm *kvm, unsigned int extension);
static inline void kvm__set_thread_name(const char *name)
{
diff --git a/kvm.c b/kvm.c
index 7fa76f7..665ed14 100644
--- a/kvm.c
+++ b/kvm.c
@@ -93,6 +93,34 @@ const char *kvm__get_dir(void)
return kvm_dir;
}
+bool kvm__supports_vm_extension(struct kvm *kvm, unsigned int extension)
+{
+ static int supports_vm_ext_check = 0;
+ int ret;
+
+ switch (supports_vm_ext_check) {
+ case 0:
+ ret = ioctl(kvm->sys_fd, KVM_CHECK_EXTENSION,
+ KVM_CAP_CHECK_EXTENSION_VM);
+ if (ret <= 0) {
+ supports_vm_ext_check = -1;
+ return false;
+ }
+ supports_vm_ext_check = 1;
+ /* fall through */
+ case 1:
+ break;
+ case -1:
+ return false;
+ }
+
+ ret = ioctl(kvm->vm_fd, KVM_CHECK_EXTENSION, extension);
+ if (ret < 0)
+ return false;
+
+ return ret;
+}
+
bool kvm__supports_extension(struct kvm *kvm, unsigned int extension)
{
int ret;
--
2.9.0
next prev parent reply other threads:[~2016-07-20 17:04 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-20 17:04 [PATCH v7 00/15] kvmtool: arm: ITS emulation and GSI routing support Andre Przywara
2016-07-20 17:04 ` [PATCH v7 01/15] FDT: introduce global phandle allocation Andre Przywara
2016-07-20 17:04 ` [PATCH v7 02/15] arm: use new phandle allocation functions Andre Przywara
2016-07-20 17:04 ` [PATCH v7 03/15] irq: move IRQ routing into irq.c Andre Przywara
2016-11-02 14:37 ` Jean-Philippe Brucker
2016-11-04 17:35 ` Andre Przywara
2016-07-20 17:04 ` [PATCH v7 04/15] MSI-X: update GSI routing after changed MSI-X configuration Andre Przywara
2016-07-20 17:04 ` [PATCH v7 05/15] virtio: fix endianness check for vhost support Andre Przywara
2016-07-20 17:04 ` [PATCH v7 06/15] PCI: Only allocate IRQ routing entry when available Andre Przywara
2016-07-20 17:04 ` [PATCH v7 07/15] TEMPORARY: update public headers for GICv3 ITS emulation Andre Przywara
2016-07-20 17:04 ` [PATCH v7 08/15] arm: allow creation of an MSI register frame region Andre Przywara
2016-07-20 17:04 ` [PATCH v7 09/15] arm: FDT: create MSI controller DT node Andre Przywara
2016-07-20 17:04 ` Andre Przywara [this message]
2016-07-20 17:04 ` [PATCH v7 11/15] PCI: inject PCI device ID on MSI injection Andre Przywara
2016-07-20 17:04 ` [PATCH v7 12/15] arm: setup SPI IRQ routing tables Andre Przywara
2016-07-20 17:04 ` [PATCH v7 13/15] extend GSI IRQ routing to take a device ID Andre Przywara
2016-07-20 17:04 ` [PATCH v7 14/15] arm64: enable GICv3-ITS emulation Andre Przywara
2016-07-20 17:04 ` [PATCH v7 15/15] arm: gic: allow 32-bit compilation Andre Przywara
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=20160720170435.28090-11-andre.przywara@arm.com \
--to=andre.przywara@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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