KVM: arm64: vgic-its: Fix misleading nr_entries in vgic_its_check_device_id

The nr_entries variable in vgic_its_check_device_id actually
describe the size of the L1 table, and not the number of
entries in this table.

Rename it to l1_tbl_size, so that we can now change the code
with a better understanding of what is what.

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>

diff --git a/virt/kvm/arm/vgic/vgic-its.c b/virt/kvm/arm/vgic/vgic-its.c
index 2ac5927b1d91366142647b51d3a1ccf2e05fd3da..268a0c7ea3a5a9b13663645a6eb7deb116a7995d 100644 (file)
--- a/virt/kvm/arm/vgic/vgic-its.c
+++ b/virt/kvm/arm/vgic/vgic-its.c
@@ -687,18 +687,18 @@ static bool vgic_its_check_device_id(struct kvm *kvm, struct vgic_its *its,
                                     int device_id)
 {
        u64 r = its->baser_device_table;
-       int nr_entries = GITS_BASER_NR_PAGES(r) * SZ_64K;
+       int l1_tbl_size = GITS_BASER_NR_PAGES(r) * SZ_64K;
        int index;
        u64 indirect_ptr;
        gfn_t gfn;
 
 
        if (!(r & GITS_BASER_INDIRECT))
-               return device_id < (nr_entries / GITS_BASER_ENTRY_SIZE(r));
+               return device_id < (l1_tbl_size / GITS_BASER_ENTRY_SIZE(r));
 
        /* calculate and check the index into the 1st level */
        index = device_id / (SZ_64K / GITS_BASER_ENTRY_SIZE(r));
-       if (index >= (nr_entries / sizeof(u64)))
+       if (index >= (l1_tbl_size / sizeof(u64)))
                return false;
 
        /* Each 1st level entry is represented by a 64-bit value. */