diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2021-11-13 00:01:55 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-11-13 00:01:55 +0300 |
| commit | 84886c262ebcfa40751ed508268457af8a20c1aa (patch) | |
| tree | 7ae331173c47e822f9cc2ab3539151bfe868a7a4 /arch/arm64/kvm/arm.c | |
| parent | 501cfe06790651af4470d8ca77f162515867cd4d (diff) | |
| parent | 50a8d3315960c74095c59e204db44abd937d4b5d (diff) | |
| download | linux-84886c262ebcfa40751ed508268457af8a20c1aa.tar.xz | |
Merge tag 'kvmarm-fixes-5.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master
KVM/arm64 fixes for 5.16, take #1
- Fix the host S2 finalization by solely iterating over the memblocks
instead of the whole IPA space
- Tighten the return value of kvm_vcpu_preferred_target() now that
32bit support is long gone
- Make sure the extraction of ESR_ELx.EC is limited to the architected
bits
- Comment fixups
Diffstat (limited to 'arch/arm64/kvm/arm.c')
| -rw-r--r-- | arch/arm64/kvm/arm.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index f5490afe1ebf..2f03cbfefe67 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -1389,12 +1389,9 @@ long kvm_arch_vm_ioctl(struct file *filp, return kvm_vm_ioctl_set_device_addr(kvm, &dev_addr); } case KVM_ARM_PREFERRED_TARGET: { - int err; struct kvm_vcpu_init init; - err = kvm_vcpu_preferred_target(&init); - if (err) - return err; + kvm_vcpu_preferred_target(&init); if (copy_to_user(argp, &init, sizeof(init))) return -EFAULT; |