From mboxrd@z Thu Jan 1 00:00:00 1970 From: christoffer.dall@linaro.org (Christoffer Dall) Date: Fri, 13 May 2016 12:11:58 +0200 Subject: [PATCH v3 40/55] KVM: arm/arm64: vgic-new: vgic_kvm_device: KVM_DEV_ARM_VGIC_GRP_CTRL In-Reply-To: <1462531568-9799-41-git-send-email-andre.przywara@arm.com> References: <1462531568-9799-1-git-send-email-andre.przywara@arm.com> <1462531568-9799-41-git-send-email-andre.przywara@arm.com> Message-ID: <20160513101158.GC16274@cbox> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Fri, May 06, 2016 at 11:45:53AM +0100, Andre Przywara wrote: > From: Eric Auger > > This patch implements the KVM_DEV_ARM_VGIC_GRP_CTRL group API > featuring KVM_DEV_ARM_VGIC_CTRL_INIT attribute. The vgic_init > function is not yet implemented though. > > Signed-off-by: Eric Auger > Signed-off-by: Andre Przywara > --- > virt/kvm/arm/vgic/vgic-kvm-device.c | 22 ++++++++++++++++++++++ > 1 file changed, 22 insertions(+) > > diff --git a/virt/kvm/arm/vgic/vgic-kvm-device.c b/virt/kvm/arm/vgic/vgic-kvm-device.c > index 05ff925..e153f12 100644 > --- a/virt/kvm/arm/vgic/vgic-kvm-device.c > +++ b/virt/kvm/arm/vgic/vgic-kvm-device.c > @@ -23,6 +23,8 @@ > static int vgic_set_common_attr(struct kvm_device *dev, > struct kvm_device_attr *attr) > { > + int r; > + > switch (attr->group) { > case KVM_DEV_ARM_VGIC_GRP_NR_IRQS: { > u32 __user *uaddr = (u32 __user *)(long)attr->addr; > @@ -55,6 +57,16 @@ static int vgic_set_common_attr(struct kvm_device *dev, > > return ret; > } > + case KVM_DEV_ARM_VGIC_GRP_CTRL: { > + switch (attr->attr) { > + case KVM_DEV_ARM_VGIC_CTRL_INIT: > + mutex_lock(&dev->kvm->lock); > + r = vgic_init(dev->kvm); > + mutex_unlock(&dev->kvm->lock); > + return r; > + } > + break; > + } > } > > return -ENXIO; > @@ -131,6 +143,11 @@ static int vgic_v2_has_attr(struct kvm_device *dev, > switch (attr->group) { > case KVM_DEV_ARM_VGIC_GRP_NR_IRQS: > return 0; > + case KVM_DEV_ARM_VGIC_GRP_CTRL: > + switch (attr->attr) { > + case KVM_DEV_ARM_VGIC_CTRL_INIT: > + return 0; > + } > } > return -ENXIO; > } > @@ -166,6 +183,11 @@ static int vgic_v3_has_attr(struct kvm_device *dev, > switch (attr->group) { > case KVM_DEV_ARM_VGIC_GRP_NR_IRQS: > return 0; > + case KVM_DEV_ARM_VGIC_GRP_CTRL: > + switch (attr->attr) { > + case KVM_DEV_ARM_VGIC_CTRL_INIT: > + return 0; > + } > } > return -ENXIO; > } > -- > 2.7.3 > Reviewed-by: Christoffer Dall