As for SVE we will need to pull parts of dynamically sized registers out of
a block of memory for SME so we will use a similar code pattern for this.
Rename the current struct sve_state_reg_region in preparation for this.

Signed-off-by: Mark Brown <broo...@kernel.org>
---
 arch/arm64/kvm/guest.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm64/kvm/guest.c b/arch/arm64/kvm/guest.c
index 30446ae357f0..1d161fa7c2be 100644
--- a/arch/arm64/kvm/guest.c
+++ b/arch/arm64/kvm/guest.c
@@ -418,9 +418,9 @@ static int set_sve_vls(struct kvm_vcpu *vcpu, const struct 
kvm_one_reg *reg)
  */
 #define vcpu_sve_slices(vcpu) 1
 
-/* Bounds of a single SVE register slice within vcpu->arch.sve_state */
-struct sve_state_reg_region {
-       unsigned int koffset;   /* offset into sve_state in kernel memory */
+/* Bounds of a single register slice within vcpu->arch.s[mv]e_state */
+struct vec_state_reg_region {
+       unsigned int koffset;   /* offset into s[mv]e_state in kernel memory */
        unsigned int klen;      /* length in kernel memory */
        unsigned int upad;      /* extra trailing padding in user memory */
 };
@@ -429,7 +429,7 @@ struct sve_state_reg_region {
  * Validate SVE register ID and get sanitised bounds for user/kernel SVE
  * register copy
  */
-static int sve_reg_to_region(struct sve_state_reg_region *region,
+static int sve_reg_to_region(struct vec_state_reg_region *region,
                             struct kvm_vcpu *vcpu,
                             const struct kvm_one_reg *reg)
 {
@@ -499,7 +499,7 @@ static int sve_reg_to_region(struct sve_state_reg_region 
*region,
 static int get_sve_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg)
 {
        int ret;
-       struct sve_state_reg_region region;
+       struct vec_state_reg_region region;
        char __user *uptr = (char __user *)reg->addr;
 
        /* Handle the KVM_REG_ARM64_SVE_VLS pseudo-reg as a special case: */
@@ -525,7 +525,7 @@ static int get_sve_reg(struct kvm_vcpu *vcpu, const struct 
kvm_one_reg *reg)
 static int set_sve_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg)
 {
        int ret;
-       struct sve_state_reg_region region;
+       struct vec_state_reg_region region;
        const char __user *uptr = (const char __user *)reg->addr;
 
        /* Handle the KVM_REG_ARM64_SVE_VLS pseudo-reg as a special case: */

-- 
2.30.2


Reply via email to