[PULL 55/56] hw/nvme: Clean up local variable shadowing in nvme_ns_init()

[Markus Armbruster]

From: Klaus Jensen <k.jen...@samsung.com>

Fix local variable shadowing in nvme_ns_init().

Reported-by: Markus Armbruster <arm...@redhat.com>
Signed-off-by: Klaus Jensen <k.jen...@samsung.com>
Message-ID: <20230925-fix-local-shadowing-v1-1-3a1172132...@samsung.com>
Reviewed-by: Jesper Wendel Devantier <j.devant...@samsung.com>
Signed-off-by: Markus Armbruster <arm...@redhat.com>
---
 hw/nvme/ns.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/nvme/ns.c b/hw/nvme/ns.c
index 44aba8f4d9..0eabcf5cf5 100644
--- a/hw/nvme/ns.c
+++ b/hw/nvme/ns.c
@@ -107,7 +107,7 @@ static int nvme_ns_init(NvmeNamespace *ns, Error **errp)
 
     ns->pif = ns->params.pif;
 
-    static const NvmeLBAF lbaf[16] = {
+    static const NvmeLBAF defaults[16] = {
         [0] = { .ds =  9           },
         [1] = { .ds =  9, .ms =  8 },
         [2] = { .ds =  9, .ms = 16 },
@@ -120,7 +120,7 @@ static int nvme_ns_init(NvmeNamespace *ns, Error **errp)
 
     ns->nlbaf = 8;
 
-    memcpy(&id_ns->lbaf, &lbaf, sizeof(lbaf));
+    memcpy(&id_ns->lbaf, &defaults, sizeof(defaults));
 
     for (i = 0; i < ns->nlbaf; i++) {
         NvmeLBAF *lbaf = &id_ns->lbaf[i];
-- 
2.41.0