From: Andre Przywara <andre.przywara@arm.com>
To: Marc Zyngier <marc.zyngier@arm.com>,
Christoffer Dall <christoffer.dall@linaro.org>,
Eric Auger <eric.auger@redhat.com>
Cc: linux-arm-kernel@lists.infradead.org,
kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org
Subject: [PATCH v10 04/17] KVM: arm/arm64: extend arch CAP checks to allow per-VM capabilities
Date: Fri, 15 Jul 2016 12:43:25 +0100 [thread overview]
Message-ID: <20160715114338.10484-5-andre.przywara@arm.com> (raw)
In-Reply-To: <20160715114338.10484-1-andre.przywara@arm.com>
KVM capabilities can be a per-VM property, though ARM/ARM64 currently
does not pass on the VM pointer to the architecture specific
capability handlers.
Add a "struct kvm*" parameter to those function to later allow proper
per-VM capability reporting.
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Reviewed-by: Eric Auger <eric.auger@linaro.org>
Acked-by: Christoffer Dall <christoffer.dall@linaro.org>
---
arch/arm/include/asm/kvm_host.h | 2 +-
arch/arm/kvm/arm.c | 2 +-
arch/arm64/include/asm/kvm_host.h | 2 +-
arch/arm64/kvm/reset.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h
index 96387d4..3c40facd 100644
--- a/arch/arm/include/asm/kvm_host.h
+++ b/arch/arm/include/asm/kvm_host.h
@@ -281,7 +281,7 @@ static inline void __cpu_reset_hyp_mode(phys_addr_t boot_pgd_ptr,
*/
}
-static inline int kvm_arch_dev_ioctl_check_extension(long ext)
+static inline int kvm_arch_dev_ioctl_check_extension(struct kvm *kvm, long ext)
{
return 0;
}
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
index c74483f..557e390 100644
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@ -201,7 +201,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
r = KVM_MAX_VCPUS;
break;
default:
- r = kvm_arch_dev_ioctl_check_extension(ext);
+ r = kvm_arch_dev_ioctl_check_extension(kvm, ext);
break;
}
return r;
diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h
index 49095fc..ebe8904 100644
--- a/arch/arm64/include/asm/kvm_host.h
+++ b/arch/arm64/include/asm/kvm_host.h
@@ -47,7 +47,7 @@
int __attribute_const__ kvm_target_cpu(void);
int kvm_reset_vcpu(struct kvm_vcpu *vcpu);
-int kvm_arch_dev_ioctl_check_extension(long ext);
+int kvm_arch_dev_ioctl_check_extension(struct kvm *kvm, long ext);
unsigned long kvm_hyp_reset_entry(void);
void __extended_idmap_trampoline(phys_addr_t boot_pgd, phys_addr_t idmap_start);
diff --git a/arch/arm64/kvm/reset.c b/arch/arm64/kvm/reset.c
index 7be24f2..3989833 100644
--- a/arch/arm64/kvm/reset.c
+++ b/arch/arm64/kvm/reset.c
@@ -65,7 +65,7 @@ static bool cpu_has_32bit_el1(void)
* We currently assume that the number of HW registers is uniform
* across all CPUs (see cpuinfo_sanity_check).
*/
-int kvm_arch_dev_ioctl_check_extension(long ext)
+int kvm_arch_dev_ioctl_check_extension(struct kvm *kvm, long ext)
{
int r;
--
2.9.0
next prev parent reply other threads:[~2016-07-15 11:43 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-15 11:43 [PATCH v10 00/17] KVM: arm64: GICv3 ITS emulation Andre Przywara
2016-07-15 11:43 ` [PATCH v10 01/17] KVM: arm/arm64: move redistributor kvm_io_devices Andre Przywara
2016-07-15 11:43 ` [PATCH v10 02/17] KVM: arm/arm64: check return value for kvm_register_vgic_device Andre Przywara
2016-07-15 11:43 ` [PATCH v10 03/17] KVM: extend struct kvm_msi to hold a 32-bit device ID Andre Przywara
2016-07-15 11:43 ` Andre Przywara [this message]
2016-07-15 11:43 ` [PATCH v10 05/17] KVM: kvm_io_bus: add kvm_io_bus_get_dev() call Andre Przywara
2016-07-15 11:43 ` [PATCH v10 06/17] KVM: arm/arm64: VGIC: add refcounting for IRQs Andre Przywara
2016-07-15 11:43 ` [PATCH v10 07/17] irqchip: refactor and add GICv3 definitions Andre Przywara
2016-07-15 11:43 ` [PATCH v10 08/17] KVM: arm64: handle ITS related GICv3 redistributor registers Andre Przywara
2016-07-15 11:43 ` [PATCH v10 09/17] KVM: arm64: introduce ITS emulation file with MMIO framework Andre Przywara
2016-07-18 9:18 ` Auger Eric
2016-07-18 9:43 ` Marc Zyngier
2016-07-18 10:06 ` Auger Eric
2016-07-18 16:34 ` Andre Przywara
2016-07-18 16:36 ` Auger Eric
2016-07-15 11:43 ` [PATCH v10 10/17] KVM: arm64: introduce new KVM ITS device Andre Przywara
2016-07-15 11:43 ` [PATCH v10 11/17] KVM: arm64: implement basic ITS register handlers Andre Przywara
2016-07-15 11:43 ` [PATCH v10 12/17] KVM: arm64: connect LPIs to the VGIC emulation Andre Przywara
2016-07-15 11:43 ` [PATCH v10 13/17] KVM: arm64: read initial LPI pending table Andre Przywara
2016-07-15 11:43 ` [PATCH v10 14/17] KVM: arm64: allow updates of LPI configuration table Andre Przywara
2016-07-15 11:43 ` [PATCH v10 15/17] KVM: arm64: implement ITS command queue command handlers Andre Przywara
2016-07-16 10:08 ` Marc Zyngier
2016-07-17 23:23 ` André Przywara
2016-07-18 7:46 ` Marc Zyngier
2016-07-18 7:45 ` André Przywara
2016-07-15 11:43 ` [PATCH v10 16/17] KVM: arm64: implement MSI injection in ITS emulation Andre Przywara
2016-07-15 11:43 ` [PATCH v10 17/17] KVM: arm64: enable ITS emulation as a virtual MSI controller Andre Przywara
2016-07-18 13:12 ` [PATCH v10 00/17] KVM: arm64: GICv3 ITS emulation Auger Eric
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=20160715114338.10484-5-andre.przywara@arm.com \
--to=andre.przywara@arm.com \
--cc=christoffer.dall@linaro.org \
--cc=eric.auger@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=marc.zyngier@arm.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