Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull KVM fixes from Paolo Bonzini:
"A small error handling problem and a compile breakage for ARM64"
* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
arm64: KVM: Add VGIC device control for arm64
KVM: return an error code in kvm_vm_ioctl_register_coalesced_mmio()
+12
-6
+9
arch/arm64/include/uapi/asm/kvm.h
+9
arch/arm64/include/uapi/asm/kvm.h
···
148
148
#define KVM_REG_ARM_TIMER_CNT ARM64_SYS_REG(3, 3, 14, 3, 2)
149
149
#define KVM_REG_ARM_TIMER_CVAL ARM64_SYS_REG(3, 3, 14, 0, 2)
150
150
151
+
/* Device Control API: ARM VGIC */
152
+
#define KVM_DEV_ARM_VGIC_GRP_ADDR 0
153
+
#define KVM_DEV_ARM_VGIC_GRP_DIST_REGS 1
154
+
#define KVM_DEV_ARM_VGIC_GRP_CPU_REGS 2
155
+
#define KVM_DEV_ARM_VGIC_CPUID_SHIFT 32
156
+
#define KVM_DEV_ARM_VGIC_CPUID_MASK (0xffULL << KVM_DEV_ARM_VGIC_CPUID_SHIFT)
157
+
#define KVM_DEV_ARM_VGIC_OFFSET_SHIFT 0
158
+
#define KVM_DEV_ARM_VGIC_OFFSET_MASK (0xffffffffULL << KVM_DEV_ARM_VGIC_OFFSET_SHIFT)
159
+
151
160
/* KVM_IRQ_LINE irq field index values */
152
161
#define KVM_ARM_IRQ_TYPE_SHIFT 24
153
162
#define KVM_ARM_IRQ_TYPE_MASK 0xff
+1
virt/kvm/arm/vgic.c
+1
virt/kvm/arm/vgic.c
+2
-6
virt/kvm/coalesced_mmio.c
+2
-6
virt/kvm/coalesced_mmio.c
···
154
154
list_add_tail(&dev->list, &kvm->coalesced_zones);
155
155
mutex_unlock(&kvm->slots_lock);
156
156
157
-
return ret;
157
+
return 0;
158
158
159
159
out_free_dev:
160
160
mutex_unlock(&kvm->slots_lock);
161
-
162
161
kfree(dev);
163
162
164
-
if (dev == NULL)
165
-
return -ENXIO;
166
-
167
-
return 0;
163
+
return ret;
168
164
}
169
165
170
166
int kvm_vm_ioctl_unregister_coalesced_mmio(struct kvm *kvm,