lkml.org 
[lkml]   [2021]   [Oct]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v2] kvm: Avoid shadowing a local in search_memslots()
Date
It is less error-prone to use a different variable name from the existing
one in a wider scope. This is also flagged by GCC (W=2):

./include/linux/kvm_host.h: In function 'search_memslots':
./include/linux/kvm_host.h:1246:7: warning: declaration of 'slot' shadows a previous local [-Wshadow]
1246 | int slot = start + (end - start) / 2;
| ^~~~
./include/linux/kvm_host.h:1240:26: note: shadowed declaration is here
1240 | struct kvm_memory_slot *slot;
| ^~~~

Signed-off-by: Qian Cai <quic_qiancai@quicinc.com>
---
include/linux/kvm_host.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 60a35d9fe259..9a62c0e52519 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -1243,12 +1243,12 @@ search_memslots(struct kvm_memslots *slots, gfn_t gfn, int *index)
return NULL;

while (start < end) {
- int slot = start + (end - start) / 2;
+ int pivot = start + (end - start) / 2;

- if (gfn >= memslots[slot].base_gfn)
- end = slot;
+ if (gfn >= memslots[pivot].base_gfn)
+ end = pivot;
else
- start = slot + 1;
+ start = pivot + 1;
}

slot = try_get_memslot(slots, start, gfn);
--
2.30.2
\
 
 \ /
  Last update: 2021-10-26 20:20    [W:0.035 / U:0.124 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site