Commit 1fe00098 authored by Christoffer Dall's avatar Christoffer Dall

KVM: arm/arm64: Rename vgic_attr_regs_access to vgic_attr_regs_access_v2

Just a rename so we can implement a v3-specific function later.

We take the chance to get rid of the V2/V3 ops comments as well.

No functional change.
Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Reviewed-by: default avatarEric Auger <eric.auger@redhat.com>
parent ba7b9169
...@@ -294,15 +294,15 @@ static bool lock_all_vcpus(struct kvm *kvm) ...@@ -294,15 +294,15 @@ static bool lock_all_vcpus(struct kvm *kvm)
return true; return true;
} }
/** vgic_attr_regs_access: allows user space to read/write VGIC registers /**
* vgic_attr_regs_access_v2 - allows user space to access VGIC v2 state
* *
* @dev: kvm device handle * @dev: kvm device handle
* @attr: kvm device attribute * @attr: kvm device attribute
* @reg: address the value is read or written * @reg: address the value is read or written
* @is_write: write flag * @is_write: true if userspace is writing a register
*
*/ */
static int vgic_attr_regs_access(struct kvm_device *dev, static int vgic_attr_regs_access_v2(struct kvm_device *dev,
struct kvm_device_attr *attr, struct kvm_device_attr *attr,
u32 *reg, bool is_write) u32 *reg, bool is_write)
{ {
...@@ -347,8 +347,6 @@ static int vgic_attr_regs_access(struct kvm_device *dev, ...@@ -347,8 +347,6 @@ static int vgic_attr_regs_access(struct kvm_device *dev,
return ret; return ret;
} }
/* V2 ops */
static int vgic_v2_set_attr(struct kvm_device *dev, static int vgic_v2_set_attr(struct kvm_device *dev,
struct kvm_device_attr *attr) struct kvm_device_attr *attr)
{ {
...@@ -367,7 +365,7 @@ static int vgic_v2_set_attr(struct kvm_device *dev, ...@@ -367,7 +365,7 @@ static int vgic_v2_set_attr(struct kvm_device *dev,
if (get_user(reg, uaddr)) if (get_user(reg, uaddr))
return -EFAULT; return -EFAULT;
return vgic_attr_regs_access(dev, attr, &reg, true); return vgic_attr_regs_access_v2(dev, attr, &reg, true);
} }
} }
...@@ -389,7 +387,7 @@ static int vgic_v2_get_attr(struct kvm_device *dev, ...@@ -389,7 +387,7 @@ static int vgic_v2_get_attr(struct kvm_device *dev,
u32 __user *uaddr = (u32 __user *)(long)attr->addr; u32 __user *uaddr = (u32 __user *)(long)attr->addr;
u32 reg = 0; u32 reg = 0;
ret = vgic_attr_regs_access(dev, attr, &reg, false); ret = vgic_attr_regs_access_v2(dev, attr, &reg, false);
if (ret) if (ret)
return ret; return ret;
return put_user(reg, uaddr); return put_user(reg, uaddr);
...@@ -433,8 +431,6 @@ struct kvm_device_ops kvm_arm_vgic_v2_ops = { ...@@ -433,8 +431,6 @@ struct kvm_device_ops kvm_arm_vgic_v2_ops = {
.has_attr = vgic_v2_has_attr, .has_attr = vgic_v2_has_attr,
}; };
/* V3 ops */
#ifdef CONFIG_KVM_ARM_VGIC_V3 #ifdef CONFIG_KVM_ARM_VGIC_V3
static int vgic_v3_set_attr(struct kvm_device *dev, static int vgic_v3_set_attr(struct kvm_device *dev,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment