diff options
| author |   Paolo Bonzini <pbonzini@redhat.com> | 2018-10-19 15:24:24 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2018-10-19 15:24:24 +0200 |
| commit | e42b4a507efa19a90c63e7968c93c4f82d3bc805 (patch) | |
| tree | cc7bf34323b26d3f53d4a9ec4ca1b5c52bc361cd /virt/kvm/arm/vgic/vgic-kvm-device.c | |
| parent | KVM: VMX: enable nested virtualization by default (diff) | |
| parent | KVM: arm64: Safety check PSTATE when entering guest and handle IL (diff) | |
| download | linux-dev-e42b4a507efa19a90c63e7968c93c4f82d3bc805.tar.xz linux-dev-e42b4a507efa19a90c63e7968c93c4f82d3bc805.zip | |
Merge tag 'kvmarm-for-v4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/arm updates for 4.20
- Improved guest IPA space support (32 to 52 bits)
- RAS event delivery for 32bit
- PMU fixes
- Guest entry hardening
- Various cleanups
Diffstat (limited to 'virt/kvm/arm/vgic/vgic-kvm-device.c')
| -rw-r--r-- | virt/kvm/arm/vgic/vgic-kvm-device.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/virt/kvm/arm/vgic/vgic-kvm-device.c b/virt/kvm/arm/vgic/vgic-kvm-device.c index 6ada2432e37c..114dce9f4bf5 100644 --- a/virt/kvm/arm/vgic/vgic-kvm-device.c +++ b/virt/kvm/arm/vgic/vgic-kvm-device.c @@ -25,7 +25,7 @@ int vgic_check_ioaddr(struct kvm *kvm, phys_addr_t *ioaddr, phys_addr_t addr, phys_addr_t alignment) { - if (addr & ~KVM_PHYS_MASK) + if (addr & ~kvm_phys_mask(kvm)) return -E2BIG; if (!IS_ALIGNED(addr, alignment)) |