Merge branch 'kvm-master' into kvm-queue
This commit is contained in:
commit
f18eb31f9d
|
@ -148,6 +148,15 @@ struct kvm_arch_memory_slot {
|
||||||
#define KVM_REG_ARM_TIMER_CNT ARM64_SYS_REG(3, 3, 14, 3, 2)
|
#define KVM_REG_ARM_TIMER_CNT ARM64_SYS_REG(3, 3, 14, 3, 2)
|
||||||
#define KVM_REG_ARM_TIMER_CVAL ARM64_SYS_REG(3, 3, 14, 0, 2)
|
#define KVM_REG_ARM_TIMER_CVAL ARM64_SYS_REG(3, 3, 14, 0, 2)
|
||||||
|
|
||||||
|
/* Device Control API: ARM VGIC */
|
||||||
|
#define KVM_DEV_ARM_VGIC_GRP_ADDR 0
|
||||||
|
#define KVM_DEV_ARM_VGIC_GRP_DIST_REGS 1
|
||||||
|
#define KVM_DEV_ARM_VGIC_GRP_CPU_REGS 2
|
||||||
|
#define KVM_DEV_ARM_VGIC_CPUID_SHIFT 32
|
||||||
|
#define KVM_DEV_ARM_VGIC_CPUID_MASK (0xffULL << KVM_DEV_ARM_VGIC_CPUID_SHIFT)
|
||||||
|
#define KVM_DEV_ARM_VGIC_OFFSET_SHIFT 0
|
||||||
|
#define KVM_DEV_ARM_VGIC_OFFSET_MASK (0xffffffffULL << KVM_DEV_ARM_VGIC_OFFSET_SHIFT)
|
||||||
|
|
||||||
/* KVM_IRQ_LINE irq field index values */
|
/* KVM_IRQ_LINE irq field index values */
|
||||||
#define KVM_ARM_IRQ_TYPE_SHIFT 24
|
#define KVM_ARM_IRQ_TYPE_SHIFT 24
|
||||||
#define KVM_ARM_IRQ_TYPE_MASK 0xff
|
#define KVM_ARM_IRQ_TYPE_MASK 0xff
|
||||||
|
|
|
@ -24,6 +24,7 @@
|
||||||
#include <linux/of.h>
|
#include <linux/of.h>
|
||||||
#include <linux/of_address.h>
|
#include <linux/of_address.h>
|
||||||
#include <linux/of_irq.h>
|
#include <linux/of_irq.h>
|
||||||
|
#include <linux/uaccess.h>
|
||||||
|
|
||||||
#include <linux/irqchip/arm-gic.h>
|
#include <linux/irqchip/arm-gic.h>
|
||||||
|
|
||||||
|
|
|
@ -154,17 +154,13 @@ int kvm_vm_ioctl_register_coalesced_mmio(struct kvm *kvm,
|
||||||
list_add_tail(&dev->list, &kvm->coalesced_zones);
|
list_add_tail(&dev->list, &kvm->coalesced_zones);
|
||||||
mutex_unlock(&kvm->slots_lock);
|
mutex_unlock(&kvm->slots_lock);
|
||||||
|
|
||||||
return ret;
|
return 0;
|
||||||
|
|
||||||
out_free_dev:
|
out_free_dev:
|
||||||
mutex_unlock(&kvm->slots_lock);
|
mutex_unlock(&kvm->slots_lock);
|
||||||
|
|
||||||
kfree(dev);
|
kfree(dev);
|
||||||
|
|
||||||
if (dev == NULL)
|
return ret;
|
||||||
return -ENXIO;
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int kvm_vm_ioctl_unregister_coalesced_mmio(struct kvm *kvm,
|
int kvm_vm_ioctl_unregister_coalesced_mmio(struct kvm *kvm,
|
||||||
|
|
Loading…
Reference in a new issue